diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-23 18:34:18 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-23 18:34:18 +0000 |
| commit | 49837b8d248555a3c5ab82a90adfd01bd24b5bc9 (patch) | |
| tree | 1e4091651bc5ab8e3251c44928e8606beb3ed5ca /libavformat | |
| parent | 2e01def0fe40e0d8c82299615e5302c7e9873e47 (diff) | |
| download | ffmpeg-49837b8d248555a3c5ab82a90adfd01bd24b5bc9.tar.gz | |
Make the nut decoder read the ff_nut_video_tags to detect codec id of
the input file.
This is required as Nut codec tags are not contained in
ff_codec_bmp_tags.
Originally committed as revision 23260 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nutdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 293f67ddc3..eed644cd6c 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -316,7 +316,9 @@ static int decode_stream_header(NUTContext *nut){ { case 0: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tmp); + st->codec->codec_id = av_codec_get_id( + (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, 0 }, + tmp); break; case 1: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |