Mercurial > libavformat.hg
comparison nutdec.c @ 6039:eeb6e3c4c32b libavformat
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.
| author | stefano |
|---|---|
| date | Sun, 23 May 2010 18:34:18 +0000 |
| parents | d0ea87d82842 |
| children | 3b049f067bdd |
comparison
equal
deleted
inserted
replaced
| 6038:d0ea87d82842 | 6039:eeb6e3c4c32b |
|---|---|
| 314 st->codec->codec_tag= tmp; | 314 st->codec->codec_tag= tmp; |
| 315 switch(class) | 315 switch(class) |
| 316 { | 316 { |
| 317 case 0: | 317 case 0: |
| 318 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; | 318 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
| 319 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tmp); | 319 st->codec->codec_id = av_codec_get_id( |
| 320 (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, 0 }, | |
| 321 tmp); | |
| 320 break; | 322 break; |
| 321 case 1: | 323 case 1: |
| 322 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; | 324 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
| 323 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, tmp); | 325 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, tmp); |
| 324 break; | 326 break; |