diff options
| author | Paul B Mahol <onemda@gmail.com> | 2015-06-12 15:49:50 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2015-06-21 09:30:01 +0000 |
| commit | 95ee0fbacfad9e79ed0f67e1e1980a53a4d2807e (patch) | |
| tree | 1f2acaf1f57e576f484b477f30cf8520ee43a46a /libavcodec | |
| parent | 54649cbda890b54dad0e76ae8886cb291be58a03 (diff) | |
| download | ffmpeg-95ee0fbacfad9e79ed0f67e1e1980a53a4d2807e.tar.gz | |
Support demuxing 4gv codec stored in qcp files
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 77cddf8fc0..b75b27e66f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -500,6 +500,7 @@ enum AVCodecID { AV_CODEC_ID_DSD_MSBF = MKBETAG('D','S','D','M'), AV_CODEC_ID_DSD_LSBF_PLANAR = MKBETAG('D','S','D','1'), AV_CODEC_ID_DSD_MSBF_PLANAR = MKBETAG('D','S','D','8'), + AV_CODEC_ID_4GV = MKBETAG('s','4','g','v'), /* subtitle codecs */ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 81baf1e543..87bbc776b3 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2524,6 +2524,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, { + .id = AV_CODEC_ID_4GV, + .type = AVMEDIA_TYPE_AUDIO, + .name = "4gv", + .long_name = NULL_IF_CONFIG_SMALL("4GV (Fourth Generation Vocoder)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_DSD_LSBF, .type = AVMEDIA_TYPE_AUDIO, .name = "dsd_lsbf", |