From ea88dc3e8e2c079cf4bf5c31ac05c0e5a025c03a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 22 May 2016 01:50:08 +0200 Subject: avformat/avienc: Rename reshuffles return variable to ensure it is not mixed up Signed-off-by: Michael Niedermayer --- libavformat/avienc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index c908c21e4f..2c748efb2d 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -718,16 +718,17 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) AVIStream *avist = s->streams[stream_index]->priv_data; AVIOContext *pb = s->pb; AVPacket *opkt = pkt; + int reshuffle_ret; if (par->codec_id == AV_CODEC_ID_RAWVIDEO && par->codec_tag == 0) { int64_t bpc = par->bits_per_coded_sample != 15 ? par->bits_per_coded_sample : 16; int expected_stride = ((par->width * bpc + 31) >> 5)*4; - ret = ff_reshuffle_raw_rgb(s, &pkt, par, expected_stride); - if (ret < 0) - return ret; + reshuffle_ret = ff_reshuffle_raw_rgb(s, &pkt, par, expected_stride); + if (reshuffle_ret < 0) + return reshuffle_ret; } else - ret = 0; + reshuffle_ret = 0; if (par->format == AV_PIX_FMT_PAL8) { - int ret2 = ff_get_packet_palette(s, opkt, ret, avist->palette); + int ret2 = ff_get_packet_palette(s, opkt, reshuffle_ret, avist->palette); if (ret2 < 0) return ret2; if (ret2) { @@ -752,7 +753,6 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) avi_stream2fourcc(tag, stream_index, par->codec_type); tag[2] = 'p'; tag[3] = 'c'; if (s->pb->seekable) { - int ret; if (avist->strh_flags_offset) { int64_t cur_offset = avio_tell(pb); avio_seek(pb, avist->strh_flags_offset, SEEK_SET); @@ -778,7 +778,7 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) } } } - if (ret) { + if (reshuffle_ret) { ret = avi_write_packet_internal(s, pkt); av_packet_free(&pkt); return ret; -- cgit v1.2.3