[FFmpeg-cvslog] avformat/mov: reuse existing err variable

James Almer git at videolan.org
Sat Nov 19 17:01:32 EET 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 19 00:54:58 2016 -0300| [eb3a59c903bd9e7547061c23d9559c130421e7b0] | committer: James Almer

avformat/mov: reuse existing err variable

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb3a59c903bd9e7547061c23d9559c130421e7b0
---

 libavformat/mov.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9bf436e..9cd0398 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5647,12 +5647,10 @@ static int mov_read_header(AVFormatContext *s)
             break;
         case AVMEDIA_TYPE_VIDEO:
             if (sc->display_matrix) {
-                int ret;
-
-                ret = av_stream_add_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, (uint8_t*)sc->display_matrix,
+                err = av_stream_add_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, (uint8_t*)sc->display_matrix,
                                               sizeof(int32_t) * 9);
-                if (ret < 0)
-                    return ret;
+                if (err < 0)
+                    return err;
 
                 sc->display_matrix = NULL;
             }



More information about the ffmpeg-cvslog mailing list