[FFmpeg-cvslog] h264: move h264_set_parameter_from_sps() call up

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 19:29:35 2012 +0100| [8ea4a5533f4dd187211c2ad13ead4142f266400d] | committer: Michael Niedermayer

h264: move h264_set_parameter_from_sps() call up

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

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

 libavcodec/h264.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 7303418..1634b1c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2602,6 +2602,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
 
         h->current_sps_id = h->pps.sps_id;
         h->sps            = *h0->sps_buffers[h->pps.sps_id];
+
+        if ((ret = h264_set_parameter_from_sps(h)) < 0)
+            return ret;
     }
 
     s->avctx->profile = ff_h264_get_profile(&h->sps);
@@ -2658,9 +2661,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
         s->avctx->sample_aspect_ratio = h->sps.sar;
         av_assert0(s->avctx->sample_aspect_ratio.den);
 
-        if ((ret = h264_set_parameter_from_sps(h)) < 0)
-            return ret;
-
         if (h->sps.video_signal_type_present_flag) {
             s->avctx->color_range = h->sps.full_range>0 ? AVCOL_RANGE_JPEG
                                                       : AVCOL_RANGE_MPEG;