aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-28 00:46:50 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-09-29 12:35:32 +0100
commitff24824a721576195c3b4a711e3ee2af900de795 (patch)
tree7a1bb3af4e4239323b2d207a50fcf7ad36e8a37f
parent570cefb02b4f149c4263677e1a3eea216ee0ec8c (diff)
downloadffmpeg-ff24824a721576195c3b4a711e3ee2af900de795.tar.gz
h264: reset ret to avoid propagating minor failures
Unbreak 772d150a6e82542c06b0c251e73dd299d98d1027. CC: libav-stable@libav.org Bug-Id: 750 / 905753 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libavcodec/h264.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 1fd5e506cd..562b1023e3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1679,6 +1679,7 @@ again:
goto end;
}
+ ret = 0;
end:
/* clean up */
if (h->cur_pic_ptr && !h->droppable) {