Browse Source

avcodec.h: Move G.729/G.723 CODEC_IDs to the correct section.

This is done conditional to the libavcodec version to avoid ABI breaks.
tags/n0.9
Diego Biurrun 14 years ago
parent
commit
463ea05ab2
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      libavcodec/avcodec.h

+ 6
- 0
libavcodec/avcodec.h View File

@@ -210,8 +210,10 @@ enum CodecID {
CODEC_ID_DFA, CODEC_ID_DFA,
CODEC_ID_WMV3IMAGE, CODEC_ID_WMV3IMAGE,
CODEC_ID_VC1IMAGE, CODEC_ID_VC1IMAGE,
#if LIBAVCODEC_VERSION_MAJOR == 53
CODEC_ID_G723_1, CODEC_ID_G723_1,
CODEC_ID_G729, CODEC_ID_G729,
#endif
CODEC_ID_UTVIDEO, CODEC_ID_UTVIDEO,


/* various PCM "codecs" */ /* various PCM "codecs" */
@@ -345,6 +347,10 @@ enum CodecID {
CODEC_ID_AAC_LATM, CODEC_ID_AAC_LATM,
CODEC_ID_QDMC, CODEC_ID_QDMC,
CODEC_ID_CELT, CODEC_ID_CELT,
#if LIBAVCODEC_VERSION_MAJOR > 53
CODEC_ID_G723_1,
CODEC_ID_G729,
#endif


/* subtitle codecs */ /* subtitle codecs */
CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.


Loading…
Cancel
Save