aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-04-03 20:58:20 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-04-03 21:13:50 +0200
commitf8413f74a1847db161a3443b1740b2659cd48753 (patch)
tree2bc8ab1456398829975495961c953f81170a2401
parent5b97681eaa5aed5103519deed4a706b89a910746 (diff)
downloadffmpeg-f8413f74a1847db161a3443b1740b2659cd48753.tar.gz
lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Fixes a sample from ticket #4182.
-rw-r--r--libavformat/mpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index a0b5738790..dbe5f103f2 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -549,6 +549,8 @@ redo:
request_probe = 50;
} else {
codec_id = AV_CODEC_ID_MP2;
+ if (m->imkh_cctv)
+ request_probe = 25;
}
} else if (startcode >= 0x80 && startcode <= 0x87) {
type = AVMEDIA_TYPE_AUDIO;