0e0d88ede9
Merge svn changes up to r31256
2010-05-30 16:39:41 +03:00
2f1a518d45
Merge svn changes up to r31211
...
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
adbb0477a0
Merge svn change r31191
2010-05-30 15:53:08 +03:00
e74361c488
Merge svn changes up to r31189
2010-05-30 15:51:33 +03:00
a286506467
Merge svn changes up to r31176
2010-05-30 15:37:34 +03:00
6f199ab3d9
Merge svn changes up to r31169
2010-05-30 15:27:58 +03:00
18657beb19
Merge svn changes up to r31145
2010-05-30 15:21:18 +03:00
1888e57af7
cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
...
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.
Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
95e8630981
Use MSGT_DECVIDEO in a video decoder.
...
Patch by Giorgio Vazzana, mywing81 gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 11:52:12 +00:00
b17704e6a8
cosmetics: Drop pointless _s suffix from 'struct ad_functions'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:10:27 +00:00
9bc124bcda
cosmetics: Drop pointless _s suffix from 'struct mp_image'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31230 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:08:30 +00:00
67958c9b9f
cosmetics: Drop _s suffix from 'struct vd_functions'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31229 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:59:15 +00:00
4ab8fea71b
cosmetics: K&R coding style
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31228 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:37 +00:00
ca04a9c8ea
cosmetics: K&R coding style
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31227 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:11 +00:00
e765b9cd43
whitespace cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31217 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-25 11:39:58 +00:00
9016e5cf0a
Avoid decoding of 0-size packets. This also fixes that the main loop believes
...
tehre is an infinite number of delayed frames, thus never finishing (happens
with -demuxer lavf -vc theora).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31206 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 23:24:25 +00:00
cc75267c6b
cosmetics: reformat ad_pcm.c in K&R style
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31193 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 14:15:27 +00:00
1dce94a26d
Ignore (but print out) offset with libtheora decoder.
...
Patch by Giorgio Vazzana, mywing81 gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31191 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-22 16:32:39 +00:00
31bc24b1d8
Fix compilation broken by FFmpeg-r23201 that changed the api of error logging.
...
Also fix evaluation after FFmpeg-r23149 "change order of parameters".
Let the filters fail if evaluation can't be done.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31187 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-20 23:17:41 +00:00
a47ef5fed6
ad_pcm: don't rely on demux packets staying valid
...
Change ad_pcm to copy input packet data into an internal buffer
instead of relying on the packet still existing at the next decode()
call. The extra memcpy could be avoided by improving the demuxer API a
bit but I don't feel like implementing that now. Also add a
ADCTRL_RESYNC_STREAM handler to drop buffered data from previous
stream position.
2010-05-15 06:08:44 +03:00
c1c68a6914
ad_pcm: fix crash at EOF
...
Fix use of unsigned type where negative values were needed. When
playing a file with multichannel PCM audio the bug could result in the
channel reorder function scrambling memory at the end of playback,
causing a crash.
2010-05-15 05:52:00 +03:00
584b43e9f8
cosmetics: reindent ad_pcm.c
2010-05-15 05:45:02 +03:00
2b26048cca
Fix compilation after r31173.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 14:20:19 +00:00
e3f191fa3f
remove vf_yuy2, functionality is replaced by -vf format=yuv2
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 13:49:05 +00:00
12f67b8372
Remove internal liba52 copy.
...
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 14:45:29 +00:00
d6f2685181
Handle Y8/Y800 formats more similar to other YUV formats.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31144 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 00:18:26 +00:00
5266b5de98
vd_ffmpeg: remove #ifdef for old FFmpeg-mt versions
...
The #ifdef is obsolete since trying to compile against the relevant
old versions will fail for other reasons.
2010-05-07 22:15:19 +03:00
e1cd86076f
Merge svn changes up to r31141
2010-05-07 22:13:35 +03:00
02641f54ee
Add support for 12-bit color mode on framebuffer devices.
...
Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-06 10:18:25 +00:00
bc767c2a98
vd_ffmpeg: use skip_frame instead of deprecated hurry_up field
2010-05-04 04:50:57 +03:00
9a34ae4fd0
Merge svn changes up to r31050
2010-04-26 18:46:18 +03:00
8df340271e
Merge svn changes up to r31040
2010-04-26 18:38:11 +03:00
7795726e0f
Merge svn changes up to r31033
2010-04-26 18:25:34 +03:00
837c48ddee
Merge svn changes up to r31020
2010-04-26 18:06:00 +03:00
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
6a7956a11b
Merge svn changes up to r30972
2010-04-26 17:44:48 +03:00
4785c2617e
Merge svn changes up to r30967
2010-04-26 17:42:20 +03:00
95fba94860
Merge svn changes up to r30917
2010-04-26 17:11:04 +03:00
ff559b8e90
Merge svn changes up to r30907
2010-04-26 16:57:25 +03:00
f9d224b1ad
Move some sh_audio field setting out of demuxer.c
...
These fields are decoder details, not information set by the demuxer.
2010-04-23 20:50:11 +03:00
06c6130710
Cosmetics/indentation fixes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31052 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:24:01 +00:00
903dedd64f
Add workaround for aac-sbr-ffaac-slow.mkv playing to slow with FFmpeg
...
AAC decoder due to wrong sample rate in container.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31051 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:22:49 +00:00
c462186142
Tell x264 that we aren't going to give it timestamps.
...
Fixes some warnings starting in x264-r1480.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 09:14:54 +00:00
6fe158d7e7
Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systems
...
lacking memalign(), e.g. Win32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 04:33:00 +00:00
c0aa5c32b2
Move functions that really do not need to be inlined from the header
...
to the .c file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 05:39:36 +00:00
e16f02fe40
Fix build due to FFmpeg r22858 change (function rename).
...
Patch by ubitux on irc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31033 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 20:03:26 +00:00
86ea8d4f4a
Fix build after FFmpeg symbol rename:
...
ff_eval2 --> ff_parse_and_eval_expr
ff_parse_eval --> ff_eval_expr
patch by ubitux, ubitux gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31031 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 08:03:39 +00:00
e3ed371d51
Fix build due to FFmpeg r22833 change (typedef rename).
...
Found by ubitux on irc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31029 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-11 13:47:13 +00:00
9ceb70782b
cosmetics: Reorder some x86-related preprocessor conditionals.
...
This fixes two of the following warnings on non-x86 machines:
libmpcodecs/vf_gradfun.c:388:5: warning: "HAVE_EBX_AVAILABLE" is not defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31025 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-06 09:46:47 +00:00
d55c67d157
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
...
not around MMX code etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31018 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:38:40 +00:00
Uoti Urpala