RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/mpeg: Support alaw in Hikvision CCTV recordings. 

Fixes a sample from ticket #4182.
This commit is contained in:
Carl Eugen Hoyos 2015-04-03 21:04:43 +02:00
parent f8413f74a1
commit 036079ce34
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mpeg.c
View File

@ -547,6 +547,9 @@ redo:
codec_id = AV_CODEC_ID_ADPCM_ADX;
// Auto-detect AC-3
request_probe = 50;
} else if (m->imkh_cctv && startcode == 0x1c0) {
codec_id = AV_CODEC_ID_PCM_ALAW;
request_probe = 50;
} else {
codec_id = AV_CODEC_ID_MP2;
if (m->imkh_cctv)
@ -593,7 +596,8 @@ skip:
st->id = startcode;
st->codec->codec_type = type;
st->codec->codec_id = codec_id;
if (st->codec->codec_id == AV_CODEC_ID_PCM_MULAW) {
if ( st->codec->codec_id == AV_CODEC_ID_PCM_MULAW
|| st->codec->codec_id == AV_CODEC_ID_PCM_ALAW) {
st->codec->channels = 1;
st->codec->channel_layout = AV_CH_LAYOUT_MONO;
st->codec->sample_rate = 8000;