90654b8eff
added code to scan the video stream to search the actual video codec used;
...
triggered only if requested by the user with option -psprobe.
Evo files require this option because H264 is stored like MPEG2
without using the PSM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22055 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:42:22 +00:00
106158f4f1
include math.h for fabsf()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22054 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:27:15 +00:00
380d0dcebc
cosmetics: reindentation and braces removal
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22053 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:25:50 +00:00
ed9e5b1565
moved scoreboarding code to 2 separate functions (update_stats() and clear_stats()) to be reused next
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22052 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:22:39 +00:00
48eb95537d
Fix number of rows in interlaced mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22042 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 13:51:24 +00:00
b9b7060e60
10l, confused current "frame" with canvas width.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22040 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 11:02:52 +00:00
25918a8b31
set has_valid_timestamps and corresponding first and final pts only after
...
having checked that at the beginning, at the middle and at the end of the
stream timestamps don't reset and that they seem to progress (almost-) linearly;
additionally probe those timestamps only when the stream type is file and it's seekable,
so all other stream types (especially network ones) won't waste time trying to seek
and possibly slowing down detection.
Seeking is not negatively affected by these changes.
Patch by Christian Aistleitner (zaek7q gmx net) reworked by me.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22039 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 10:45:34 +00:00
fec3b1e82e
Hack: use refmode == 1 instead of == 0, as browsers behave like this
...
and buggy files like http://samples.mplayerhq.hu/GIF/broken-gif/CLAIRE.GIF
rely on this.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22038 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 10:34:11 +00:00
c518d68f25
Set sh_video->bih->biWidth properly, fixes decoding after latest dec_video.c change
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22037 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 09:53:42 +00:00
edf1fb46d2
Call real_fix_timestamp() after seeking, to avoid video freezing
...
because of wrong timestamps. Fixes seek_sample2.rmvb and others.
Patch by LR ))) hephooey ))(( gmail )( com (((
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22036 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 22:34:27 +00:00
92258be85a
Simplify and make lzo decompression code more similar to zlib one.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22029 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 14:54:45 +00:00
d7da0ebc20
Forgotten free on error
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22028 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 14:52:18 +00:00
d8f2eaca08
*dest = malloc (*size); is useless directly before *dest = realloc (*dest, *size);
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22026 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 14:45:52 +00:00
ef3b7add5f
Remove comment printed by -demuxer help, it belongs in the copyright header.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22015 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 17:48:38 +00:00
fa7d28e854
Remove ff_gcd prototype and include avutil.h instead where it is defined.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22013 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 10:49:43 +00:00
2669d9536a
Use interleaver id to select the correct interleaver instead of guessing
...
it from the codec id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22007 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 21:20:08 +00:00
e77fbf0bd7
Use interleaver id to select the correct interleaver instead of guessing
...
it from the codec id.
Fixes gittin_13.ra
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22005 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 15:05:42 +00:00
ef29ff34ff
better autodetection of framerate in case of h264; it works correctly with b-frames.
...
Patch by Eugen Hoyos (cehoyos ag or at)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22001 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-23 22:26:13 +00:00
68f75d788f
substream 0x75 doesn't seem to be a valid vc1 stream, after all; removed
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21997 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:29:54 +00:00
3253bba2b3
set priv->last_pts to the pts read only if the pts was really read; patch by zaek7q gmx net (Christian Aistleitner)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21996 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:24:50 +00:00
2e66db0c4a
Discard -Wdeclaration-after-statement warning.
...
patch by Carl Eugen Hoyos, cehoyos ag.or at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21992 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 23:21:50 +00:00
8e374ff809
Instead of printing a useless "sig11 coming soon" message, just abort parsing
...
in the hope of still saving things (helps with at least
http://sam.zoy.org/zzuf/lol-mplayer.wmv ).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21986 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 18:29:18 +00:00
75282a6a83
Sanity-check sh_video->bih->biSize
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21985 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 18:22:07 +00:00
4b9ddc69a0
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 15:44:58 +00:00
3ccc6712e3
Forgotten CodecTag -> AVCodecTag
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21980 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:33:34 +00:00
abb0510502
Fix compilation after lavf changes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21979 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:17:40 +00:00
cb47a72a44
support -ffourcc with -of lavf
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21978 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:10:07 +00:00
2abbb9c863
in h264_parse_sps() reuse mp_unescape03()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21971 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:46:17 +00:00
6d708c31b6
vc1 probing code: if sh_video->bih can't be callocated exit
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21970 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:14:09 +00:00
b5d12d6e0f
in vc1 probing code, all packets before the first sequence header must be skipped, not read
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21969 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:10:40 +00:00
8823921db8
removed unused variables; replaced wrong call to realloc() with calloc() in vc1 probing code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21968 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:06:17 +00:00
488013915f
decode vc1 sequence header and frame it in video_read_frame();
...
it doesn't work yet, but it permits debugging and development to Kostya
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21967 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:17:22 +00:00
fa90811f58
demux vc1 (stream id 0x1Fd with 0x55 <= substream id <= 0x5F in the pes_extension_2 payload)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21966 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:13:50 +00:00
58c3d666eb
added function to parse vc1 sequence header
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21965 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:04:20 +00:00
c70d547ea6
Compile fix: LE_* -> AV_RL*
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21963 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-19 23:14:57 +00:00
34ef7517eb
1000l; fixed wrong operator precedence
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21952 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 21:42:04 +00:00
8397554a2a
unified creation of sh_audio and sh_video is ts_add_stream; patch by elupus
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21947 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 00:12:35 +00:00
375fe84da6
in evo files [e]ac3 substreams range from 0xc0 to 0xcf
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 22:50:47 +00:00
3d834fb592
Interlaced gif support
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21940 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 07:12:32 +00:00
410b243885
Change some types to uint8_t where appropriate
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21939 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 07:05:28 +00:00
e6c460e462
"Cosmetics" Introduce a memcpy function doing both transparent
...
and non-transparent copy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21938 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 07:01:53 +00:00
9c56f01564
one more #if 1 removed
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 23:03:45 +00:00
12233b5063
removed useless #if1s added too long time ago
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 21:39:30 +00:00
6443cc76f5
in EVO files substreams 0xC0 of private streams 0xBD contain [e]ac3.
...
A more proper range will be committed when specs begin to appear;
for the time being enjoy the audio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21935 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 21:21:42 +00:00
86756e67b0
demux_rtp_codec.cpp 💯 `INT_MAX' undeclared (first use this function)
...
patch by Carl Eugen Hoyos, cehoyos ag.or at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21929 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 04:57:43 +00:00
cc05fc22e8
Cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21914 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:56:42 +00:00
ba63e7b28d
Implement gif transparency
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21913 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:56:02 +00:00
79cc33a851
Fix: refmodes 2 and 3 leave useref unchanged
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21912 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:46:27 +00:00
497403d31f
Cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21911 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:39:13 +00:00
5b7eb989f2
Implement refmode == 2 in gif demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21910 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:37:53 +00:00
9cfea7d129
Partially support gif using "reference" images
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21909 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:19:42 +00:00
18fe1c0613
memset + malloc -> calloc
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21908 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:05:18 +00:00
d765e163b8
Cast SWidth/SHeight to uint16_t, since that's what they actually are.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21905 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:49:20 +00:00
f6a9b356cd
Forgot to adjust length of memset
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21904 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:46:43 +00:00
16c183be83
Simplify gif demuxer by using memcpy_pic
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21903 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:44:36 +00:00
d359f1537c
One more bounds check, though IMO the gif lib really should do this.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21902 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:40:05 +00:00
0636ab5f58
Simplify
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21901 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:37:59 +00:00
e52420a9fe
Fix crash for gif images that have Top or Left set
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21900 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:37:18 +00:00
eb2b0bc2a7
Fix invalid read for gifs with a palette for less than 256 colors
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21899 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:06:40 +00:00
6a2c85c59c
Move global variables in gif demuxer into priv struct
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21898 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:05:32 +00:00
cc57387c23
cosmetics: typo fix pallete --> palette
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21894 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 06:02:31 +00:00
4b8743d056
Frametime was being read from the wrong offset, compare
...
http://www.onicos.com/staff/iz/formats/gif.html#gceb
patch by John Koleszar, jkoleszar on2 com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21893 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 06:00:34 +00:00
18dedd6eec
add support for avc1 in X-QT over RTSP
...
patch by Carl Eugen Hoyos cehoyos at ag.or.at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21889 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-12 19:59:47 +00:00
2394b7da95
dont write an index and dont use memory to build one if -noidx is specified
...
... maybe this should use its own option though instead of using -noidx ?
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21858 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-08 16:23:31 +00:00
ca95de6acd
Simplify demux_ogg to use the sub_clear_text and sub_add_text functions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21846 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:19:15 +00:00
61e4a80191
Subtitle handling cleanup: factor out code for parsing embedded subtitles
...
and adding and removing of lines in subtitle struct into subreader.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:07:58 +00:00
0c8d9ba25f
Include "internal" libavformat/riff.h also when dynamic libavformat is used
...
instead of duplicating typedefs and function prototypes in already three
different places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 17:28:11 +00:00
a52c97540c
Include libavformat/riff.h when building with static libavformat and
...
add and correct prototypes if not.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 14:40:05 +00:00
0a6856d341
Simplify after last demux_ogg commit
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21830 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 18:03:58 +00:00
50dc3ce2c7
Do not access ogg_d->subs after freeing it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21829 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 18:02:18 +00:00
e3fe6113a6
sizeof() is long, thus %d format in error message is wrong.
...
Fix by assigning extradata_size before and printing that, since
this also removes a bit of code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21828 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:41:00 +00:00
9e1add871e
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
...
-1 could be a perfectly valid pts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:24:38 +00:00
538674f6b6
set dp->stream_pts only when feeding the video stream to workaround
...
strange interleaving patterns in some samples (that show with wild
alternations of the OSD timer going back and forth)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21807 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-01 22:47:14 +00:00
55303b223e
removed unused variable
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 17:24:14 +00:00
8558d03eb9
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:09:53 +00:00
33ce3088d1
replace call to ds_read_packet() with the usual stream_read()+ds_add_packet() sequence;
...
fill demux_packet->stream_pts if the stream layer supports it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21797 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:08:27 +00:00
b5898c2aa6
added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:05:26 +00:00
9eb302dee8
sort
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21795 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 10:54:32 +00:00
f89822df44
dont read index if -noidx
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21788 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 19:01:55 +00:00
8f7f2ad9e0
first step toward amr-nb muxing support
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 18:56:28 +00:00
016b1cb9e5
don't compile demux_mpc.c when libmpcdec is disabled
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 23:44:38 +00:00
d1c91ec012
add support for musepack native decoder from ffmpeg (require -demuxer lavf)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21779 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 00:40:49 +00:00
7c44ff0483
Sync to libnut, nom->num
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21739 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 12:34:31 +00:00
29a0a85b48
Fix display of multiple simultaneous subtitles without libass.
...
Was broken in r19649.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21720 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-21 22:11:47 +00:00
cf099b2100
muxers now write to output muxer->stream rather than to muxer->file
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +00:00
7ac56b70b8
doxify a comment
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21667 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 15:15:21 +00:00
9526342555
Require 12 consecutive MPEG-audio headers before detecting as audio.
...
Fixes misdetection of http://samples.mplayerhq.hu/FLV/flv_misdetected_as_mpa
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21666 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 15:14:23 +00:00
370c07962b
ASF aspect support via metadata reading.
...
Patch by Zuxy Meng (zuxy meng (at) gmail.com) with some
simplifications by me.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21626 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 21:51:20 +00:00
8d4098a160
VobSub tracks cannot be handled by libass, do not mark them with 'a'.
...
This fixes the bug with VobSub not being displayed with -ass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 19:35:06 +00:00
b9e8186ac3
Respect -noidx in lavf demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 21:37:00 +00:00
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
27b0177662
Remove superfluous comment.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
d8b0acaa87
Cosmetics: indentation fix.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-23 17:37:28 +00:00
e9ca4efbc0
permit muxing to raw pes (VDR uses this)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21157 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 22:09:58 +00:00
d52d16f96e
Remove superfluous empty variable declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +00:00
a9eada9189
check we aren't short of sh_videos before allocating another one
...
and fail if the allocation doesn't succeed;
added support for video stream switching
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 23:31:01 +00:00
a6961fa26f
slight simplification in demux_control_ts: no need to check *arg with last_{aid,vid} (small bugfix, too)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 21:03:46 +00:00
cf4bf03dc2
Unify dep/depend targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
1390d0cf93
Reorganize code to move more things out of main().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 09:12:07 +00:00
07ccc9193c
in demux_ts_control unified SWITCH_AUDIO and SWITCH_VIDEO (they were identical)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21088 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:36:14 +00:00
f12bae62c0
during DEMUXER_CTRL_SWITCH_x *arg set to -2 identifies 'disable stream x'
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21083 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:10:30 +00:00
nicodvb
reimar
rtogni
diego
gpoirier
michael
aurel
ods15
uau
eugeni
nplourde
