diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2012-10-12 15:49:36 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-10-13 12:33:18 +0200 |
| commit | 1bd442c276e6688b43777a198cad0d7e3a92123f (patch) | |
| tree | 91d70ca799a3aecdddfa296f1f75454fc7c9d27f /libavformat/nutdec.c | |
| parent | 5d2be71b9ecf2a88752666a2c4039f4d98419d35 (diff) | |
| download | ffmpeg-1bd442c276e6688b43777a198cad0d7e3a92123f.tar.gz | |
nut: prioritize native tags
Use native tags instead of avi ones, simplifies a lot raw video codecs
handling.
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index dd02aadf5f..8448e13702 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -350,8 +350,8 @@ static int decode_stream_header(NUTContext *nut) case 0: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) { - ff_codec_bmp_tags, ff_nut_video_tags, + ff_codec_bmp_tags, 0 }, tmp); @@ -991,8 +991,5 @@ AVInputFormat ff_nut_demuxer = { .read_close = nut_read_close, .read_seek = read_seek, .extensions = "nut", - .codec_tag = (const AVCodecTag * const []) { - ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, - ff_nut_subtitle_tags, 0 - }, + .codec_tag = ff_nut_codec_tags, }; |