Forgotten in 7da57875.
Unified · Split
| @@ -489,7 +489,6 @@ static int mpegps_read_packet(AVFormatContext *s, · 488 unmodified lines | |||
| 489 | MpegDemuxContext *m = s->priv_data; | 489 | MpegDemuxContext *m = s->priv_data; |
| 490 | AVStream *st; | 490 | AVStream *st; |
| 491 | int len, startcode, i, es_type, ret; | 491 | int len, startcode, i, es_type, ret; |
| 492 | int lpcm_header_len = -1; //Init to suppress warning | ||
| 493 | int pcm_dvd = 0; | 492 | int pcm_dvd = 0; |
| 494 | int request_probe= 0; | 493 | int request_probe= 0; |
| 495 | enum AVCodecID codec_id = AV_CODEC_ID_NONE; | 494 | enum AVCodecID codec_id = AV_CODEC_ID_NONE; |
| @@ -507,8 +506,7 @@ redo: · 11 unmodified lines | |||
| 507 | 506 | ||
| 508 | if (!m->raw_ac3) { | 507 | if (!m->raw_ac3) { |
| 509 | /* audio: skip header */ | 508 | /* audio: skip header */ |
| 510 | avio_r8(s->pb); | 509 | avio_skip(s->pb, 3); |
| 511 | lpcm_header_len = avio_rb16(s->pb); | ||
| 512 | len -= 3; | 510 | len -= 3; |
| 513 | if (startcode >= 0xb0 && startcode <= 0xbf) { | 511 | if (startcode >= 0xb0 && startcode <= 0xbf) { |
| 514 | /* MLP/TrueHD audio has a 4-byte header */ | 512 | /* MLP/TrueHD audio has a 4-byte header */ |