virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

ffmpeg: don't overwrite av_bsf_receive_packet return value before checking it

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-11-05 00:04:27 -03:00
parent 51e329918d
commit 55061bbc55
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ffmpeg.c
View File

@ -800,6 +800,12 @@ static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
while (idx) { while (idx) {
/* get a packet from the previous filter up the chain */ /* get a packet from the previous filter up the chain */
ret = av_bsf_receive_packet(ost->bsf_ctx[idx - 1], pkt); ret = av_bsf_receive_packet(ost->bsf_ctx[idx - 1], pkt);
if (ret == AVERROR(EAGAIN)) {
ret = 0;
idx--;
continue;
} else if (ret < 0)
goto finish;
/* HACK! - aac_adtstoasc updates extradata after filtering the first frame when /* HACK! - aac_adtstoasc updates extradata after filtering the first frame when
* the api states this shouldn't happen after init(). Propagate it here to the * the api states this shouldn't happen after init(). Propagate it here to the
* muxer and to the next filters in the chain to workaround this. * muxer and to the next filters in the chain to workaround this.
@ -811,12 +817,6 @@ static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
goto finish; goto finish;
ost->bsf_extradata_updated[idx - 1] |= 1; ost->bsf_extradata_updated[idx - 1] |= 1;
} }
if (ret == AVERROR(EAGAIN)) {
ret = 0;
idx--;
continue;
} else if (ret < 0)
goto finish;
/* send it to the next filter down the chain or to the muxer */ /* send it to the next filter down the chain or to the muxer */
if (idx < ost->nb_bitstream_filters) { if (idx < ost->nb_bitstream_filters) {