Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / h264_sei.c

diff --git a/ffmpeg/libavcodec/h264_sei.c b/ffmpeg/libavcodec/h264_sei.c
index aa889b8bba369b9a13acb081b6b40676ff8cf7c3..8e1697a31e4910cdac9efc8e825a869bf73bd914 100644 (file)
--- a/ffmpeg/libavcodec/h264_sei.c
+++ b/ffmpeg/libavcodec/h264_sei.c
@@ -281,7 +281,7 @@ static int decode_display_orientation(H264Context *h)
 
 int ff_h264_decode_sei(H264Context *h)
 {
-    while (get_bits_left(&h->gb) > 16) {
+    while (get_bits_left(&h->gb) > 16 && show_bits(&h->gb, 16)) {
         int type = 0;
         unsigned size = 0;
         unsigned next;