[FFmpeg-cvslog] h264: More restrictive more_rbsp_data_in_pps()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  1 17:28:46 2011 +0100| [3e1951e8f4a615cde2e65117f2dbd38bac6e57b6] | committer: Michael Niedermayer

h264: More restrictive more_rbsp_data_in_pps()
Fixes Ticket697

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

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

 libavcodec/h264_ps.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index ad364fb..b3ebd4d 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -488,7 +488,10 @@ build_qp_table(PPS *pps, int t, int index, const int depth)
 static int more_rbsp_data_in_pps(H264Context *h, PPS *pps)
 {
     const SPS *sps = h->sps_buffers[pps->sps_id];
-    if (sps->constraint_set_flags & 7) {
+    int profile_idc = sps->profile_idc;
+
+    if ((profile_idc == 66 || profile_idc == 77 ||
+         profile_idc == 88) && (sps->constraint_set_flags & 7)) {
         av_log(h->s.avctx, AV_LOG_WARNING,
                "Current profile doesn't provide more RBSP data in PPS, skipping\n");
         return 0;