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/nutenc.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/nutenc.c')
| -rw-r--r-- | libavformat/nutenc.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 4b1e66379c..6338924f48 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -374,6 +374,8 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc){ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream *st, int i){ NUTContext *nut = avctx->priv_data; AVCodecContext *codec = st->codec; + unsigned codec_tag = av_codec_get_tag(ff_nut_codec_tags, codec->codec_id); + ff_put_v(bc, i); switch(codec->codec_type){ case AVMEDIA_TYPE_VIDEO: ff_put_v(bc, 0); break; @@ -382,8 +384,12 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream default : ff_put_v(bc, 3); break; } ff_put_v(bc, 4); - if (codec->codec_tag){ - avio_wl32(bc, codec->codec_tag); + + if (!codec_tag) + codec_tag = codec->codec_tag; + + if (codec_tag) { + avio_wl32(bc, codec_tag); } else { av_log(avctx, AV_LOG_ERROR, "No codec tag defined for stream %d\n", i); return AVERROR(EINVAL); @@ -873,8 +879,5 @@ AVOutputFormat ff_nut_muxer = { .write_packet = nut_write_packet, .write_trailer = nut_write_trailer, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, - .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, }; |