diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:38:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:46:13 +0200 |
| commit | 82c0055c5e71f2289936e6c2528bed5826c18c43 (patch) | |
| tree | e4510e6a8cf751182378f293f7a8bc4f253c0097 /libavformat/nut.h | |
| parent | db51c65961bd692fc6ebb12c2f4183699d3db9c0 (diff) | |
| parent | b5198a2637b7b45b0049a1d4b386a06f016f2520 (diff) | |
Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'
* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
configure: recognise Minix as OS
configure: work around bug in ash shell
eval-test: make table static const
lavr: handle clipping in the float to s32 conversion
nut: support pcm codecs not mapped in avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.h')
| -rw-r--r-- | libavformat/nut.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/nut.h b/libavformat/nut.h index dad03f7ea6..673f12f4b2 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -109,6 +109,7 @@ typedef struct NUTContext { extern const AVCodecTag ff_nut_subtitle_tags[]; extern const AVCodecTag ff_nut_video_tags[]; +extern const AVCodecTag ff_nut_audio_tags[]; extern const AVCodecTag * const ff_nut_codec_tags[]; |