diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-09-30 19:28:28 +0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-10-04 13:58:53 +0400 |
| commit | 12bd8532cf09883e5d1f1ec817c18a376147deb8 (patch) | |
| tree | d80b1f77416ebea1629174e4fe073634fa41931c /libavcodec/avcodec.h | |
| parent | 7d49f79f1cd47783a963a757a6563b9cac29db62 (diff) | |
Synchronize various 4CCs and codec tags from FFmpeg.
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 4d61f44e9c..2e37f5a1b1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -210,6 +210,8 @@ enum CodecID { CODEC_ID_DFA, CODEC_ID_WMV3IMAGE, CODEC_ID_VC1IMAGE, + CODEC_ID_G723_1, + CODEC_ID_G729, /* various PCM "codecs" */ CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs |