diff options
| author | Sascha Sommer <saschasommer@freenet.de> | 2009-09-16 15:08:26 +0000 |
|---|---|---|
| committer | Sascha Sommer <saschasommer@freenet.de> | 2009-09-16 15:08:26 +0000 |
| commit | d859bb1db0b082644881058a12653e3207855678 (patch) | |
| tree | f1472353e4ff258de5862f06c1b4ddf38019845a /ffmpeg.c | |
| parent | 9d66ef18fa5504b073067691ed906bc15cfc9c87 (diff) | |
| download | ffmpeg-d859bb1db0b082644881058a12653e3207855678.tar.gz | |
Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)
Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1280,7 +1280,8 @@ static int output_packet(AVInputStream *ist, int ist_index, handle_eof: ist->pts= ist->next_pts; - if(avpkt.size && avpkt.size != pkt->size && verbose>0) + if(avpkt.size && avpkt.size != pkt->size && + !(ist->st->codec->codec->capabilities & CODEC_CAP_SUBFRAMES) && verbose>0) fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index); /* decode the packet if needed */ |