[FFmpeg-cvslog] hevc: Fix 4K sample video

[Kieran]

ffmpeg | branch: master | Kieran <kierank at obe.tv> | Sat Jun 14 19:25:09 2014 +0100| [bc21260e643c2249e38f7485bceada1d4bbb2b9a] | committer: Michael Niedermayer

hevc: Fix 4K sample video

Reviewed-by: smarter
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/hevc_ps.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 647f83e..30e58a2 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -376,9 +376,10 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
             goto err;
         }
         if (vps->vps_num_reorder_pics[i] > vps->vps_max_dec_pic_buffering[i] - 1) {
-            av_log(s->avctx, AV_LOG_ERROR, "vps_max_num_reorder_pics out of range: %d\n",
+            av_log(s->avctx, AV_LOG_WARNING, "vps_max_num_reorder_pics out of range: %d\n",
                    vps->vps_num_reorder_pics[i]);
-            goto err;
+            if (s->avctx->strict_std_compliance > FF_COMPLIANCE_NORMAL)
+                goto err;
         }
     }