Uoti Urpala
e74361c488
Merge svn changes up to r31189
2010-05-30 15:51:33 +03:00
Uoti Urpala
a286506467
Merge svn changes up to r31176
2010-05-30 15:37:34 +03:00
Uoti Urpala
6f199ab3d9
Merge svn changes up to r31169
2010-05-30 15:27:58 +03:00
Uoti Urpala
18657beb19
Merge svn changes up to r31145
2010-05-30 15:21:18 +03:00
Uoti Urpala
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
iive
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
Uoti Urpala
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
Uoti Urpala
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
Uoti Urpala
584b43e9f8
cosmetics: reindent ad_pcm.c
2010-05-15 05:45:02 +03:00
cehoyos
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
siretart
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
diego
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
reimar
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
Uoti Urpala
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
Uoti Urpala
e1cd86076f
Merge svn changes up to r31141
2010-05-07 22:13:35 +03:00
cehoyos
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
Uoti Urpala
bc767c2a98
vd_ffmpeg: use skip_frame instead of deprecated hurry_up field
2010-05-04 04:50:57 +03:00
Uoti Urpala
9a34ae4fd0
Merge svn changes up to r31050
2010-04-26 18:46:18 +03:00
Uoti Urpala
8df340271e
Merge svn changes up to r31040
2010-04-26 18:38:11 +03:00
Uoti Urpala
7795726e0f
Merge svn changes up to r31033
2010-04-26 18:25:34 +03:00
Uoti Urpala
837c48ddee
Merge svn changes up to r31020
2010-04-26 18:06:00 +03:00
Uoti Urpala
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
Uoti Urpala
6a7956a11b
Merge svn changes up to r30972
2010-04-26 17:44:48 +03:00
Uoti Urpala
4785c2617e
Merge svn changes up to r30967
2010-04-26 17:42:20 +03:00
Uoti Urpala
95fba94860
Merge svn changes up to r30917
2010-04-26 17:11:04 +03:00
Uoti Urpala
ff559b8e90
Merge svn changes up to r30907
2010-04-26 16:57:25 +03:00
Uoti Urpala
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
reimar
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
reimar
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
lorenm
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
zuxy
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
reimar
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
iive
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
diego
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
iive
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
diego
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
reimar
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
diego
935147dd64
Mark vf_size_preset_fields m_option_t array as const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31001 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:08 +00:00
diego
75fad5bac6
Mark encoder-related m_option_t struct arrays as const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:59:09 +00:00
diego
ff93cd656b
Add a header for x264enc_set_param() instead of forward declaring it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
diego
8b4b82d008
Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.
...
The file is only compiled if that condition is true.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 13:51:14 +00:00
reimar
91ec3ae682
Fix crash with incomplete yuv2 frames.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30972 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 00:08:28 +00:00
diego
a8a34f32a1
Convert asm keyword to __asm__.
...
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm).
The latter form is accepted in any syntax as an extension (without
requiring further command-line options).
Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30962 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-26 08:13:10 +00:00
diego
db734715dc
Fix build due to codecs_path vs. codec_path typo.
...
patch by Erik Auerswald, auerswal unix-ag.uni-kl de
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30950 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:40:37 +00:00
diego
5e480c7b81
Get rid of pointless def_path variable; use codec_path directly instead.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30949 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 18:01:00 +00:00
diego
cb26eaf0bb
Real binary loader code should respect the binary codec path.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30948 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 17:52:46 +00:00
Uoti Urpala
faea4ef439
ad_ffmpeg: prefer codec to container samplerate for ffaac
...
Container-level information can be unreliable for AAC because of SBR
handling problems, so use the samplerate value from the codec
instead.
2010-03-21 18:46:19 +02:00
diego
70c66c0476
Rename get_path.[ch] --> path.[ch].
...
These files now contain different functions related to path handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
diego
a06a3d476d
Move SetCodecPath() from loader to get_path.c and make it unconditional.
...
This fixes compilation with the Win32 loader disabled but other binary
codec loaders enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:27:07 +00:00
reimar
443a427b0e
Remove unnecessary size limits and a related define for hm12 decoder.
...
Patch by Stephen Warren [swarren nvidia com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30940 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 19:44:02 +00:00