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

Print "Multiple frames in a packet" warning independant of CODEC_CAP_SUBFRAMES 

because CODEC_CAP_SUBFRAMES is primarely misused to hide this warning otherwise
which renders the flag completely useless.

Originally committed as revision 21480 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-01-27 13:27:18 +00:00
parent 8670f84cf9
commit 3ff0daf06d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -299,6 +299,7 @@ typedef struct AVInputStream {
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
int showed_multi_packet_warning;
} AVInputStream;
typedef struct AVInputFile {
@ -1312,8 +1313,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
ist->pts= ist->next_pts;
if(avpkt.size && avpkt.size != pkt->size &&
!(ist->st->codec->codec->capabilities & CODEC_CAP_SUBFRAMES) && verbose>0)
(!ist->showed_multi_packet_warning && verbose>0 || verbose>1)){
fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning=1;
}
/* decode the packet if needed */
decoded_data_buf = NULL; /* fail safe */