Uoti Urpala
b390b9b28f
Merge svn changes up to r30185
2010-01-08 01:36:05 +02:00
Uoti Urpala
efe742e3fa
Merge svn r30174
2010-01-08 01:22:33 +02:00
Uoti Urpala
d157b2a8ce
Merge svn changes up to r30173
2010-01-08 01:17:56 +02:00
Uoti Urpala
dd0bab9239
Ignore svn change r30166
2010-01-08 01:07:33 +02:00
Uoti Urpala
231b33a02f
Merge svn changes up to r30165
2010-01-08 01:05:30 +02:00
reimar
8e778e5019
Add missing avcodec_close to vf_screenshot.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30185 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 15:56:33 +00:00
stefano
763360ccad
Prefer enum PixelFormat over int for the type of the format parameter
...
of getSubSampleFactors().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30184 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 15:20:07 +00:00
reimar
2f228574be
Basic -vo matrixview documentation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30183 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:55:15 +00:00
reimar
a7be2e180b
Finally add matrixview vo.
...
Heavily cleaned up/fixed etc. by me, improvements are still possible though.
Patch originally by Pigeon <pigeon at pigeond.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:54:51 +00:00
reimar
1ebc2cbbd8
Document -vo gl colorspace suboption.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30181 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:44:45 +00:00
stefano
e8d92b1e66
Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for the
...
swscale_configuration() and swscale_license() functions, consistent
with the rest of FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30180 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:35:20 +00:00
reimar
f06aa83a83
Add pointers to a few more standard OpenGL functions to ease future extensions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30179 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 12:55:09 +00:00
reimar
c23a01e260
Fixup SDL configure check:
...
- Make it work without sdl-config which adds at least useless or even hurtful
cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
instead of something else. Thus #undef main is needed in the test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 11:33:33 +00:00
reimar
485b17cc7d
Do not assume that "long" is the size of a register.
...
Fixes aclib compilation on mingw64 (with --enable-runtime-cpudetection).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30177 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 09:20:01 +00:00
reimar
4a981bf09a
Also detect fontconfig when it requires -liconv
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30176 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 09:11:20 +00:00
reimar
ec0c6d2a91
Change fribidi check to also work without fribidi-config.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30175 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 01:00:21 +00:00
reimar
2e557e3b28
Add support for JPEG2000 via FFmpeg/OpenJPEG
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:58:56 +00:00
reimar
1d3fd9e1ea
Also support decoding of 8-bit-per-component dpx files.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30173 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:50:15 +00:00
stefano
e786fb79c5
Simplify usePal() macro, make it use av_pix_fmt_descriptors.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30172 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:22:49 +00:00
stefano
f192bfea2a
Simplify getSubSampleFactors(), make it use the values provided by
...
av_pix_fmt_descriptors().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30171 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:09:24 +00:00
reimar
13fe3d4986
Mark AC3 as 16-bit format, this simplifies alignment calculation and fixes
...
hwac3 with ALSA reportedly broken by r29750.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30170 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 20:45:27 +00:00
reimar
12760fc513
Several hacks to fix compilation of tvi_dshow on MinGW64.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 17:41:11 +00:00
reimar
f4f37e555a
Fix typo in code disabling VIDIX on mingw64
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30168 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 16:55:41 +00:00
reimar
bb99b3f640
Disable vidix on 64 bit MinGW compiles, it seems to fail compiling and
...
certainly was never tested.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30167 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 16:47:26 +00:00
reimar
c1d166be18
Fix compilation if FreeType is not available, in particular do not try to build
...
libass and use the internal ass.h as a stub for structs needed for EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 18:51:59 +00:00
Uoti Urpala
52126e574c
demux_mkv: improve seeking with generated index
...
When using generated index (-idx / -forceidx) the Matroska seeking
code first guessed a file position using bitrate-based heuristics,
then located the cluster nearest to that file position. Change it to
store cluster timestamps in addition to file positions and seek to the
cluster with the closest timestamp. This makes seeking with -idx a lot
more accurate.
This change also fixes a crash when trying to seek with generated
index before playing any data from the beginning of the file (could be
triggered by -idx together with ordered chapters or -ss for example).
I removed the code handling MATROSKA_ID_CUES in the middle of parsing
clusters. Such cue entries were not consistently handled if
encountered during playback instead of index creation and the seek
code was also buggy when they were encountered and parsed; i didn't
consider it worth the effort to fix it.
2010-01-01 19:17:51 +02:00
reimar
92cd6dc3e9
Simplify range-checking functions for subopt parsing.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:23:16 +00:00
reimar
f102ac7a8c
Fix function declarations to avoid casting function pointers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:18:49 +00:00
reimar
5f684e1b32
Slightly generalize code to generate YUV->RGB conversion table and add
...
XYZ->RGB conversion as an example for that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30163 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:54:09 +00:00
jrash
85344073fa
sync with en/mplayer.1 r30135
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30162 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:53:28 +00:00
reimar
6450271656
Make YUV->RGB conversion coefficients selectable for -vo gl.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:47:43 +00:00
reimar
17c214c820
Do not needlessly use the BP register in x86_64-specific code, there are
...
enough other registers available that are less likely to cause issues.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30160 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 09:46:24 +00:00
reimar
0eb6b9aa95
One more fix for -vf scale with alpha.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30159 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 01:25:35 +00:00
reimar
c0cae7b327
Also pass alpha plane to swscale, avoids crashes when converting between
...
YUV with alpha and some other format supporting alpha.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30158 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 01:06:34 +00:00
reimar
8afc25d710
Add support for YUV format with alpha and fix the codecs.conf entry for vp6a
...
to use it.
Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:45:07 +00:00
reimar
c07dec1a4a
Also pass the 4th plane for planar formats on to libavcodec.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30156 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:39:21 +00:00
reimar
0ff930da82
Try to put the list of output formats for vf_scale in a more sensible
...
order.
While the 16-bit yuv formats should not be preferred over the 8-bit ones,
it seems reasonable to probe them directly after the equivalent 8-bit formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30155 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:25:21 +00:00
reimar
a994808e31
Deduplicate the mp_image planes allocation code.
...
The code in vf.c and mp_image.c is almost the same, though the one in vf.c
is more up-to-date/has more bug fixes and thus is used as the basis
(which is why the diff is so big).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30154 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:09:35 +00:00
reimar
2150bddc74
Add support for FFmpeg's ffv210 codec.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30153 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 22:53:51 +00:00
reimar
a326622304
Add support for 16-bit per component YUV formats.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 22:53:25 +00:00
reimar
498ad7ba57
First steps to supporting different YUV->RGB conversion definitions.
...
The numbers are possibly still wrong though.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 19:59:58 +00:00
reimar
0ecf324ac5
Extract functions to generate yuv->rgb matrices and lookup tables into a
...
separate file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:25:35 +00:00
reimar
c4c806a9d7
Put the colourspace-related variables into a separate struct to ease
...
extracting the code and sharing with other vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:07:37 +00:00
reimar
8fb7d45abd
Make code slightly more readable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30148 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 16:47:53 +00:00
reimar
b78313acd8
Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30147 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 16:46:44 +00:00
reimar
54e6b786f4
More readable fourcc for ffflac
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30146 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 11:29:21 +00:00
Uoti Urpala
3ad06dd7d2
demux_mkv: remove useless code
...
Remove leftover code that no longer did anything useful after earlier
changes.
2009-12-31 08:09:51 +02:00
Uoti Urpala
edcc0c9674
demux_mkv: respect -forceidx
...
Don't use the index included in the file if the -forceidx option was
specified.
2009-12-31 07:07:38 +02:00
reimar
c97d19eb49
Add a hack for broken youtube servers not returning Accept-Ranges.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30145 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 20:50:03 +00:00
compn
e25e6ec309
add tm2x / tm2a binary decoder
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30144 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 19:37:19 +00:00