[FFmpeg-cvslog] avformat/movenc: propagate shift_data errors properly

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun May 29 16:51:57 2016 +0200| [15005701b590dfeed3d597444f1f5391ff1cfbb0] | committer: Marton Balint

avformat/movenc: propagate shift_data errors properly

The second one is not explicitly needed, as res is not reset, but it is there
for consistency.

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavformat/movenc.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3a633a6..f8bfcfe 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5731,6 +5731,8 @@ static int mov_write_trailer(AVFormatContext *s)
         if (mov->flags & FF_MOV_FLAG_FASTSTART) {
             av_log(s, AV_LOG_INFO, "Starting second pass: moving the moov atom to the beginning of the file\n");
             res = shift_data(s);
+            if (res < 0)
+                goto error;
             if (res == 0) {
                 avio_seek(pb, mov->reserved_header_pos, SEEK_SET);
                 if ((res = mov_write_moov_tag(pb, mov, s)) < 0)
@@ -5762,6 +5764,8 @@ static int mov_write_trailer(AVFormatContext *s)
         if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) {
             av_log(s, AV_LOG_INFO, "Starting second pass: inserting sidx atoms\n");
             res = shift_data(s);
+            if (res < 0)
+                goto error;
             if (res == 0) {
                 int64_t end = avio_tell(pb);
                 avio_seek(pb, mov->reserved_header_pos, SEEK_SET);