diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:22:24 +0200 |
| commit | 674216991d409316155695baeb6b69c22c758815 (patch) | |
| tree | 97b390e16c5f2378f193499224a05445d9715bd0 /libavcodec/avcodec.h | |
| parent | af285072b5d226bb0032b8576d132d01e2d22fa1 (diff) | |
| parent | 47aed43990e2bf31d0599d5ac862afa5e264a601 (diff) | |
| download | ffmpeg-674216991d409316155695baeb6b69c22c758815.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix APE tag dependencies
MS Expression Encoder Screen decoder
libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 045ab8b4b4..c007175ef1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -260,6 +260,7 @@ enum CodecID { CODEC_ID_MSS1, CODEC_ID_MSA1, CODEC_ID_TSCC2, + CODEC_ID_MTS2, CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'), CODEC_ID_EXR = MKBETAG('0','E','X','R'), |