[FFmpeg-cvslog] lavc: 1000l, unbreak ABI
Michael Niedermayer
git at videolan.org
Sat Dec 10 07:13:46 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 10 07:03:20 2011 +0100| [f5ecc4c616397d657aca9cceef396a0a281c53c9] | committer: Michael Niedermayer
lavc: 1000l, unbreak ABI
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5ecc4c616397d657aca9cceef396a0a281c53c9
---
libavcodec/avcodec.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 98c9021..26502b9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -209,7 +209,6 @@ enum CodecID {
CODEC_ID_8SVX_FIB,
#endif
CODEC_ID_ESCAPE124,
- CODEC_ID_ESCAPE130,
CODEC_ID_DIRAC,
CODEC_ID_BFI,
CODEC_ID_CMV,
@@ -255,6 +254,7 @@ enum CodecID {
CODEC_ID_BMV_VIDEO,
CODEC_ID_VBLE,
CODEC_ID_UTVIDEO = 0x800,
+ CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
More information about the ffmpeg-cvslog
mailing list