ffmpeg | branch: master | Carl Eugen Hoyos <[email protected]> | Sun May 17 12:57:27 2015 +0200| [ee8c18387d02a7ee5ee3317cf1cecd84a7e0d91a] | committer: Carl Eugen Hoyos
lavf/mpeg: Do not detect unknown audio in Hikvision streams as alaw. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee8c18387d02a7ee5ee3317cf1cecd84a7e0d91a --- libavformat/mpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 9cc0422..edb134f 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -550,7 +550,7 @@ redo: codec_id = AV_CODEC_ID_ADPCM_ADX; // Auto-detect AC-3 request_probe = 50; - } else if (m->imkh_cctv && startcode == 0x1c0) { + } else if (m->imkh_cctv && startcode == 0x1c0 && len > 80) { codec_id = AV_CODEC_ID_PCM_ALAW; request_probe = 50; } else { _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
