ffmpeg | branch: release/2.5 | Carl Eugen Hoyos <ceho...@ag.or.at> | Fri Mar 13
08:49:03 2015 +0100| [1456ed2dd55e0ceece13dbca98d8189513ae25b5] | committer:
Carl Eugen Hoyos
lavf: Do not list mov-only codecs in riff.c.
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes ticket #4307.
(cherry picked from commit 2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367)
Conflicts:
libavformat/riff.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1456ed2dd55e0ceece13dbca98d8189513ae25b5
---
libavformat/avidec.c | 7 +++++++
libavformat/riff.c | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 78a6dea..032731d 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -36,6 +36,7 @@
#include "riff.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/exif.h"
+#include "libavformat/isom.h"
typedef struct AVIStream {
int64_t frame_offset; /* current frame (video) or byte (audio) counter
@@ -771,6 +772,12 @@ static int avi_read_header(AVFormatContext *s)
st->codec->codec_tag = tag1;
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags,
tag1);
+ if (!st->codec->codec_id) {
+ st->codec->codec_id =
ff_codec_get_id(ff_codec_movvideo_tags,
+ tag1);
+ if (st->codec->codec_id)
+ av_log(s, AV_LOG_WARNING, "mov tag found in avi\n");
+ }
/* This is needed to get the pict type which is necessary
* for generating correct pts. */
st->need_parsing = AVSTREAM_PARSE_HEADERS;
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 8d7b1c2..c63e406 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -362,7 +362,6 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') },
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '5') },
{ AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') },
- { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'N') },
{ AV_CODEC_ID_NONE, 0 }
};
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
