Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: update copyright year to 2013
  h264: check SPS entries directly to detect pixel format changes
  forgotten changelogs for 9_beta2

Conflicts:
	Changelog
	cmdutils.c
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 3 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index 7bea6afabf..c5167dc075 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,7 @@ version <next>:
 - Sony Wave64 muxer
 - adobe and limelight publisher authentication in RTMP
 - data: URI scheme
+- support building on the Plan 9 operating system
 
 
 version 1.0:
@@ -164,6 +165,7 @@ version 0.11:
 - vorbis parser
 - png parser
 - audio mix filter
+- ffv1: support (draft) version 1.3
 
 
 version 0.10:
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index bbb9606648..f6cfa1a35d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2788,7 +2788,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
         }
     }
 
-
     if (s->context_initialized &&
         (
          needs_reinit                   ||
@@ -2822,6 +2821,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
                    "Cannot (re-)initialize context during parallel decoding.\n");
             return -1;
         }
+
         if ((ret = get_pixel_format(h)) < 0)
             return ret;
         s->avctx->pix_fmt = ret;