[FFmpeg-cvslog] h264: use must_reinit to simplify code

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 21:39:14 2012 +0100| [ca4dd3810e20028d100e39bc42ebc39712c70573] | committer: Michael Niedermayer

h264: use must_reinit to simplify code

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

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 63a4c76..de7a5ac 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2781,11 +2781,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
         s->avctx->pix_fmt = pix_fmt;
 
     if (s->context_initialized &&
-        (s->width  != s->avctx->coded_width   ||
-         s->height != s->avctx->coded_height  ||
-         pix_fmt   != s->avctx->pix_fmt ||
+        (
          needs_reinit                   ||
-         av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
+         must_reinit)) {
 
         if (h != h0) {
             av_log(s->avctx, AV_LOG_ERROR, "changing width/height on "