avformat/avienc: Rename reshuffles return variable to ensure it is not mixed up
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 21 May 2016 23:50:08 +0000 (01:50 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 22 May 2016 00:14:33 +0000 (02:14 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/avienc.c

index c908c21..2c748ef 100644 (file)
@@ -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;