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/nut.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/nut.c')
-rw-r--r-- | libavformat/nut.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 6a68e28173..b666bff716 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -22,6 +22,7 @@ #include "libavutil/mathematics.h" #include "libavutil/tree.h" #include "nut.h" +#include "riff.h" #include "internal.h" const AVCodecTag ff_nut_subtitle_tags[] = { @@ -89,6 +90,11 @@ const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_NONE , 0 } }; +const AVCodecTag * const ff_nut_codec_tags[] = { + ff_nut_video_tags, ff_nut_subtitle_tags, + ff_codec_bmp_tags, ff_codec_wav_tags, 0 +}; + void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ int i; for(i=0; i<nut->avf->nb_streams; i++){ |