diff options
| author | Paul B Mahol <onemda@gmail.com> | 2019-10-01 11:34:09 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2019-10-05 11:15:42 +0200 |
| commit | 7da57875b57012478aed546818b2d52985d13793 (patch) | |
| tree | 1f1e025f5d09b0eb0462ce2f85d862a2d23d5c32 /libavformat/mpeg.c | |
| parent | 7c145b64417fbe674f90785d2e5a5afea1a1b821 (diff) | |
| download | ffmpeg-7da57875b57012478aed546818b2d52985d13793.tar.gz | |
avformat/mpeg: better fix for MLP versus PCM-DVD misdetection
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 3205f209e6..6f132aae05 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -490,6 +490,7 @@ static int mpegps_read_packet(AVFormatContext *s, AVStream *st; int len, startcode, i, es_type, ret; int lpcm_header_len = -1; //Init to suppress warning + int pcm_dvd = 0; int request_probe= 0; enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum AVMediaType type; @@ -513,6 +514,12 @@ redo: /* MLP/TrueHD audio has a 4-byte header */ avio_r8(s->pb); len--; + } else if (startcode >= 0xa0 && startcode <= 0xaf) { + ret = ffio_ensure_seekback(s->pb, 3); + if (ret < 0) + return ret; + pcm_dvd = (avio_rb24(s->pb) & 0xFF) == 0x80; + avio_skip(s->pb, -3); } } } @@ -591,7 +598,7 @@ redo: codec_id = AV_CODEC_ID_DTS; } else if (startcode >= 0xa0 && startcode <= 0xaf) { type = AVMEDIA_TYPE_AUDIO; - if (lpcm_header_len >= 6 && startcode == 0xa1) { + if (!pcm_dvd) { codec_id = AV_CODEC_ID_MLP; } else { codec_id = AV_CODEC_ID_PCM_DVD; |