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/nut.h | |
| 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/nut.h')
| -rw-r--r-- | libavformat/nut.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |