hello,
this patch syncs up avcodec.h, thus allowing projects to switch
between both without running into incompatable libavcodecs.
in ffmpeg, codec enums that are not supported in libav are defined to
dummy ids so they dont interfere with compatability.
please let me know if there are any issues.
-compn
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c2a3098..23bb52c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -210,9 +210,9 @@ enum CodecID {
CODEC_ID_DFA,
CODEC_ID_WMV3IMAGE,
CODEC_ID_VC1IMAGE,
- CODEC_ID_G723_1,
- CODEC_ID_G729,
- CODEC_ID_UTVIDEO,
+ CODEC_ID_8SVX_RAW,
+ CODEC_ID_G2M,
+ CODEC_ID_UTVIDEO = 0x800,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start
of audio codecs
@@ -345,6 +345,8 @@ enum CodecID {
CODEC_ID_AAC_LATM,
CODEC_ID_QDMC,
CODEC_ID_CELT,
+ CODEC_ID_G729 = 0x15800,
+ CODEC_ID_G723_1= 0x15801,
/* subtitle codecs */
CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at
the start of subtitle codecs.
@@ -357,10 +359,14 @@ enum CodecID {
CODEC_ID_HDMV_PGS_SUBTITLE,
CODEC_ID_DVB_TELETEXT,
CODEC_ID_SRT,
+ CODEC_ID_MICRODVD,
/* other specific kind of codecs (generally used for attachments) */
CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at
the start of various fake codecs.
CODEC_ID_TTF= 0x18000,
+ CODEC_ID_BINTEXT,
+ CODEC_ID_XBIN,
+ CODEC_ID_IDF,
CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE)
but lavf should attempt to identify it
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
