diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 02:03:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 02:03:14 +0100 |
| commit | 0bd42ae72c0e88826b823d8106286d5abe2028e7 (patch) | |
| tree | da7087d1f67ea54580026e30dcedb4f58db6aba6 /libavcodec/avcodec.h | |
| parent | 5955c63c36e9b822f1186cd45a8dec5056b9c575 (diff) | |
| parent | 1c8c41ff079953d332f61a9d26656e4e36af606c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: Avoid a warning about mixed declarations and code
BMV demuxer and decoder
matroskaenc: Make sure the seekhead struct is freed even on seek failure
mpeg12enc: Remove write-only variables.
mpeg12enc: Don't set up run-level info for level 0.
msmpeg4: Don't set up run-level info for level 0.
avformat: Warn about using network functions without calling avformat_network_init
avformat: Revise wording
rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
rdt: Check the return value of avformat_open
rtsp: Discard the dynamic handler, if it has an alloc function which failed
dsputil: use cpuflags in x86 versions of vector_clip_int32()
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index aedacd76c8..07377c87c7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -220,6 +220,7 @@ enum CodecID { CODEC_ID_G729_DEPRECATED, #endif CODEC_ID_UTVIDEO_DEPRECATED, + CODEC_ID_BMV_VIDEO, CODEC_ID_UTVIDEO = 0x800, CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), @@ -363,6 +364,7 @@ enum CodecID { CODEC_ID_8SVX_EXP, CODEC_ID_8SVX_FIB, #endif + CODEC_ID_BMV_AUDIO, CODEC_ID_G729 = 0x15800, CODEC_ID_G723_1= 0x15801, CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'), |