diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 02:19:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 02:46:09 +0200 |
| commit | ba2cf854d03ac8f563af5f71dfba27f7bd857a06 (patch) | |
| tree | 3972f45701fc12f25821195b429a01a51073a3db /libavformat | |
| parent | a93c221ccd7a036de052e79659fe5b082f586279 (diff) | |
| download | ffmpeg-ba2cf854d03ac8f563af5f71dfba27f7bd857a06.tar.gz | |
lavc: move AVRn to a seperate decoder.
The special cases in demuxers and decoders are a mess otherwise (and more
would be needed to support it fully)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 5 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index d3bb8d85f9..a70a0113a0 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -635,11 +635,6 @@ 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); st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. - // Support "Resolution 1:1" for Avid AVI Codec - if(tag1 == MKTAG('A', 'V', 'R', 'n') && - st->codec->extradata_size >= 31 && - !memcmp(&st->codec->extradata[28], "1:1", 3)) - st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ st->codec->extradata_size+= 9; diff --git a/libavformat/riff.c b/libavformat/riff.c index 2152c0fbdb..77dc797157 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -154,7 +154,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, - { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, + { AV_CODEC_ID_AVRN, MKTAG('A', 'V', 'R', 'n') }, { AV_CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, { AV_CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, { AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */ |