diff options
| author | Paul B Mahol <onemda@gmail.com> | 2019-04-10 12:10:09 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2019-04-11 11:58:34 +0200 |
| commit | d0f24df648f46e4c9a385e12a057fbade21427db (patch) | |
| tree | f1caceb1d36beac9e486d92f928d87adc8ecee77 /libavformat | |
| parent | 7be8f7ac8143f4ae144c4951ddc5d42d466a9e23 (diff) | |
| download | ffmpeg-d0f24df648f46e4c9a385e12a057fbade21427db.tar.gz | |
avcodec: add ADPCM AGM decoder
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 394481becd..741a6515df 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -605,5 +605,6 @@ const AVCodecGuid ff_codec_wav_guids[] = { { AV_CODEC_ID_ATRAC9, { 0xD2, 0x42, 0xE1, 0x47, 0xBA, 0x36, 0x8D, 0x4D, 0x88, 0xFC, 0x61, 0x65, 0x4F, 0x8C, 0x83, 0x6C } }, { AV_CODEC_ID_EAC3, { 0xAF, 0x87, 0xFB, 0xA7, 0x02, 0x2D, 0xFB, 0x42, 0xA4, 0xD4, 0x05, 0xCD, 0x93, 0x84, 0x3B, 0xDD } }, { AV_CODEC_ID_MP2, { 0x2B, 0x80, 0x6D, 0xE0, 0x46, 0xDB, 0xCF, 0x11, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA } }, + { AV_CODEC_ID_ADPCM_AGM,{ 0x82, 0xEC, 0x1F, 0x6A, 0xCA, 0xDB, 0x19, 0x45, 0xBD, 0xE7, 0x56, 0xD3, 0xB3, 0xEF, 0x98, 0x1D } }, { AV_CODEC_ID_NONE } }; diff --git a/libavformat/version.h b/libavformat/version.h index 495a6ee8e1..b611d4d75f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 #define LIBAVFORMAT_VERSION_MINOR 27 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |