summaryrefslogtreecommitdiff
path: root/libavformat/mpeg.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-05-17 12:57:27 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-05-17 12:57:27 +0200
commitee8c18387d02a7ee5ee3317cf1cecd84a7e0d91a (patch)
tree2e679af7508697f1fbd5e0f67d7971faef014856 /libavformat/mpeg.c
parent70c0433525bc4f98c91c6a6d09025e90a847e62f (diff)
lavf/mpeg: Do not detect unknown audio in Hikvision streams as alaw.
Diffstat (limited to 'libavformat/mpeg.c')
-rw-r--r--libavformat/mpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 9cc0422dff..edb134f740 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 {