diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:30:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:31:55 +0200 |
| commit | db51c65961bd692fc6ebb12c2f4183699d3db9c0 (patch) | |
| tree | 7d3f3c5e54d8ddb6bb4c07dab60707cf398ef238 /libavformat | |
| parent | 03760297b1d3a7b358e04b48329f8c96ff6307ff (diff) | |
| parent | 1bd442c276e6688b43777a198cad0d7e3a92123f (diff) | |
| download | ffmpeg-db51c65961bd692fc6ebb12c2f4183699d3db9c0.tar.gz | |
Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'
* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
nut: prioritize native tags
Conflicts:
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nut.c | 6 | ||||
| -rw-r--r-- | libavformat/nut.h | 2 | ||||
| -rw-r--r-- | libavformat/nutdec.c | 7 | ||||
| -rw-r--r-- | libavformat/nutenc.c | 5 |
4 files changed, 11 insertions, 9 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 02dd122b0a..c30bac8e8e 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[] = { @@ -112,6 +113,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++){ diff --git a/libavformat/nut.h b/libavformat/nut.h index 53b5ebc4db..dad03f7ea6 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -110,6 +110,8 @@ typedef struct NUTContext { extern const AVCodecTag ff_nut_subtitle_tags[]; extern const AVCodecTag ff_nut_video_tags[]; +extern const AVCodecTag * const ff_nut_codec_tags[]; + typedef struct Dispositions { char str[9]; int flag; diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index b2bbb9a36b..1513f5dad5 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -361,8 +361,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); @@ -1034,8 +1034,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, }; diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index ccd6cb1800..53ebd74c3c 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -981,8 +981,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, }; |