2cfcfc4f22
Set AVFMT_FLAG_GENPTS if -correct-pts is used.
...
This should allow using -correct-pts (and thus filters which adjust pts
or add frames) with dvd or other mpeg container files by specifying
"-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2
decoder too but certainly not with internal demuxer.
Using this flag isn't quite optimal as it can cause extra buffering of
demuxed frames, but at least it's better than just failing until a more
complex solution is implemented.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 00:50:38 +00:00
3e7616ecab
align vbuf_size to the max value allowed by main profile @ high level
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 22:21:37 +00:00
77226f96ba
Replace another MIN macro by FFMIN
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:25:25 +00:00
6caf5586ee
Get rid of min/max macros from aviheader.h, they do not belong here.
...
Replace their uses by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
83916cab7f
Remove condition that should always be true
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:59:49 +00:00
a8bf24702b
Fix crash in ogg demuxer uninit with -aid
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:59:09 +00:00
4a5164d995
made vorbis_info a member of ogg_stream rather than ogg_demuxer;
...
this change paves the way for multi audio track support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21535 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 20:53:05 +00:00
28564d6355
vorbis_comment is only used locally, move it out of demuxer struct
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 12:02:51 +00:00
6fb4b1b30a
Remove unused ov_struct_t
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 12:02:01 +00:00
18004d2d98
Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
a4147be5f7
Fix memleaks caused by missing vorbis/theora_info/comment_clear calls.
...
Code still seems wrong to me for multiple audio tracks, since there is
only one vorbis comment/info entry for the demuxer, not one per track?
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:46:50 +00:00
e704821b75
disable telecining when it can't be applied
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 22:08:11 +00:00
a176dc29b9
since display_frames in increased by a possibly negative number it had better be signed
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:58:07 +00:00
9e365b6032
cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:27:05 +00:00
7057e42777
removed dead code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:24:39 +00:00
8ec5a6a3ca
reimplemented :telecine and :film2pal in terms of dgpulldown
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:20:01 +00:00
858813f36f
pre-store in bff_mask the correct or-mask to be saved in the pce (slightly faster)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 20:38:46 +00:00
6dc68e8680
10l: wrong bitmask when patching the pce_ptr in soft_telecine()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:52:11 +00:00
2fded9964f
added generalized teleciner by Donald Graft
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:02:15 +00:00
b5a682f0aa
Rename: ass_process_font -> ass_add_font.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:35:40 +00:00
0639d41ffc
Use libavutil LE_* macros instead of pointer casts which can result
...
in crashes due to missing alignment. Should fix bug #640 .
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21470 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 16:41:55 +00:00
6d8213c5d6
cosmetics: anti-chaos reindentation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 12:06:08 +00:00
4a6ad7c674
Unicode support for demuxer info in ASF demuxer.
...
Patch by Zuxy Meng [zuxy meng <at> gmail com].
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21461 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 11:35:11 +00:00
9c2d44923a
Remove superfluous bswap.h include.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:32:44 +00:00
c00059b047
Remove suffix rules that are just copies of make builtin rules.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:08:25 +00:00
44e2adf8d3
Use standard name for C++ flags.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21435 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 11:41:58 +00:00
b5ecb3ba07
permit to specify the sizes of the decoders' buffers
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 23:51:51 +00:00
24f3a0132c
100l confused FFMIN/FFMAX
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:43:36 +00:00
0af2daec29
Proper fix for last demux_avi commit, stream switching now really should
...
not hang anymore
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:24:42 +00:00
f32179337e
Make sure we do not hang if no streams are available
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 18:51:44 +00:00
d441d65f34
Implement stream switching for AVI demuxer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 17:57:29 +00:00
b125a9e129
Add libav include paths to CFLAGS without indirection.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 01:11:42 +00:00
ef393a0650
Use av_int2flt/av_int2dbl to read float values. This is simpler and more
...
correct since it also works for int endianness != float endianness.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21404 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-30 17:55:00 +00:00
15eb8639c6
Move initialization of sh_audio/sh_video members to aviheader
...
where possible so that all a_streams[]/v_streams[] are initialized
and switching becomes simpler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21403 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-30 17:48:00 +00:00
b7b22bd874
Remove some superfluous include CFLAGS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:14:03 +00:00
cac6c0eea2
Remove bswap.h, use libavutil/bswap.h instead.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
19300ef1db
support for Westwood SND1 audio
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21378 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 10:51:39 +00:00
11d2b91f23
Fix 2 header bugs introduced by nplourde's previous commit:
...
#include "loader/qtx/qtxsdk/components.h" needs inttypes.h which was no
more implicitly included by earlier headers, and "#ifdef MACOSX" was
used before '#include "config.h"'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21370 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:53:07 +00:00
cf332d16c2
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21369 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:13:08 +00:00
3adbef1c80
Use av_int2dbl to read doubles instead of our somewhat broken le2me_dbl
...
(le2me_dbl assumes float and int endianness are the same).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21363 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 19:01:04 +00:00
01755ed66a
Remove long double reading code, long double was never used AFAICT and
...
is gone from the specification since a long time due to portability issues.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21360 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 18:34:08 +00:00
31844ae22d
cosmetics: Sort SRCS by alphabetical order.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21353 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 11:53:08 +00:00
02436df5fc
Split muxers into a separate library that only MEncoder is linked against.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 14:26:52 +00:00
f415c639b9
Move common code to mpcommon.mak.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 13:32:24 +00:00
d4e86e6a11
Remove unnecessary header indirection.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21305 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 02:20:15 +00:00
42bf94ecc7
10l: Muxers were not being compiled even when MEncoder was enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21302 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:36:13 +00:00
a46183fb2c
FFmpeg-style conditional dependency declaration
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:37:03 +00:00
dc2be42703
Merge common parts of all Makefiles into one file included by all.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
c95db8d583
Simplify, remove useless indirection.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:04:14 +00:00
53ba4dd6eb
Cleanup for uselessly complicated closed-caption subtitle handling
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 22:06:00 +00:00
uau
nicodvb
reimar
eugeni
diego
nplourde