diff options
Diffstat (limited to 'src/combined/ffmpeg')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 5 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 4074ff776..8559c6ece 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -107,6 +107,8 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"}, {BUF_AUDIO_FLVADPCM, CODEC_ID_ADPCM_SWF, "Flash ADPCM (ffmpeg)"}, {BUF_AUDIO_WAVPACK, CODEC_ID_WAVPACK, "WavPack (ffmpeg)"}, + {BUF_AUDIO_AMR_NB, CODEC_ID_AMR_NB, "AMR narrow band (ffmpeg)"}, + {BUF_AUDIO_AMR_WB, CODEC_ID_AMR_WB, "AMR wide band (ffmpeg)"}, }; @@ -519,7 +521,8 @@ static const uint32_t supported_audio_types[] = { BUF_AUDIO_SMACKER, BUF_AUDIO_FLVADPCM, BUF_AUDIO_WAVPACK, - + BUF_AUDIO_AMR_NB, + BUF_AUDIO_AMR_WB, 0 }; diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 02fcdce40..8afbde890 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -320,6 +320,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_CAVS, CODEC_ID_CAVS, "Chinese AVS (ffmpeg)"}, {BUF_VIDEO_VMNC, CODEC_ID_VMNC, "VMware Screen Codec (ffmpeg)"}, {BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"}, + {BUF_VIDEO_SNOW, CODEC_ID_SNOW, "Snow (ffmpeg)"}, }; static const char *const skip_loop_filter_enum_names[] = { @@ -1731,6 +1732,7 @@ static const uint32_t supported_video_types[] = { BUF_VIDEO_FLASHSV, BUF_VIDEO_CAVS, BUF_VIDEO_VMNC, + BUF_VIDEO_SNOW, BUF_VIDEO_THEORA_RAW, 0 }; |