Browse code

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>

Michael Niedermayer authored on 2013/01/03 21:22:45
Showing 2 changed files
... ...
@@ -54,6 +54,7 @@ version <next>:
54 54
 - Sony Wave64 muxer
55 55
 - adobe and limelight publisher authentication in RTMP
56 56
 - data: URI scheme
57
+- support building on the Plan 9 operating system
57 58
 
58 59
 
59 60
 version 1.0:
... ...
@@ -164,6 +165,7 @@ version 0.11:
164 164
 - vorbis parser
165 165
 - png parser
166 166
 - audio mix filter
167
+- ffv1: support (draft) version 1.3
167 168
 
168 169
 
169 170
 version 0.10:
... ...
@@ -2788,7 +2788,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
2788 2788
         }
2789 2789
     }
2790 2790
 
2791
-
2792 2791
     if (s->context_initialized &&
2793 2792
         (
2794 2793
          needs_reinit                   ||
... ...
@@ -2822,6 +2821,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
2822 2822
                    "Cannot (re-)initialize context during parallel decoding.\n");
2823 2823
             return -1;
2824 2824
         }
2825
+
2825 2826
         if ((ret = get_pixel_format(h)) < 0)
2826 2827
             return ret;
2827 2828
         s->avctx->pix_fmt = ret;