RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

do not return an error, but warn and recover when encountering an audio packet 

that should countain a signaled mpeg-pes packet.

Originally committed as revision 11428 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ivo van Poorten 2008-01-05 22:27:49 +00:00
parent 7705cf7e15
commit dba13944f0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/pva.c
View File

@ -66,6 +66,7 @@ static int pva_read_packet(AVFormatContext *s, AVPacket *pkt) {
int ret, syncword, streamid, reserved, flags, length, pts_flag; int ret, syncword, streamid, reserved, flags, length, pts_flag;
int64_t pva_pts = AV_NOPTS_VALUE; int64_t pva_pts = AV_NOPTS_VALUE;
recover:
syncword = get_be16(pb); syncword = get_be16(pb);
streamid = get_byte(pb); streamid = get_byte(pb);
get_byte(pb); /* counter not used */ get_byte(pb); /* counter not used */
@ -111,8 +112,10 @@ static int pva_read_packet(AVFormatContext *s, AVPacket *pkt) {
pes_header_data_length = get_byte(pb); pes_header_data_length = get_byte(pb);
if (pes_signal != 1) { if (pes_signal != 1) {
av_log(s, AV_LOG_ERROR, "expected signaled PES packet\n"); av_log(s, AV_LOG_WARNING, "expected signaled PES packet, "
return AVERROR(EIO); "trying to recover\n");
url_fskip(pb, length - 9);
goto recover;
} }
get_buffer(pb, pes_header_data, pes_header_data_length); get_buffer(pb, pes_header_data, pes_header_data_length);