aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-09-12 12:46:34 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-09-12 12:46:34 +0000
commit2f0f5b2059563a8478a6ef90ceec37089a8dcbcf (patch)
tree983fb7752e35479d09475bca74c04b17f17d01b6
parent66370d3fca1ce0628d83ff34f47e11515ff7eb9f (diff)
downloadffmpeg-2f0f5b2059563a8478a6ef90ceec37089a8dcbcf.tar.gz
mpegvideo_probe cant distinguish mpeg4 and mpeg1 raws :( so m4v needs "-f m4v" now
Originally committed as revision 926 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libav/raw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libav/raw.c b/libav/raw.c
index 6cfa268e13..1d52dded78 100644
--- a/libav/raw.c
+++ b/libav/raw.c
@@ -244,10 +244,11 @@ AVInputFormat m4v_iformat = {
"m4v",
"raw MPEG4 video format",
0,
- mpegvideo_probe,
+ NULL /*mpegvideo_probe*/,
video_read_header,
raw_read_packet,
raw_read_close,
+ extensions: "m4v", //FIXME remove after writing mpeg4_probe
value: CODEC_ID_MPEG4,
};