diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-03 13:22:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-03 13:22:45 +0100 |
| commit | 1894302a44f3babe736fabd78e168a70cb16ffac (patch) | |
| tree | 5efdaf8f53c779e31e146a2b4aee9fc3442c07d8 /libavcodec | |
| parent | dc8b36746a9d5101ef6ce146473c65a8827c51b1 (diff) | |
| parent | 7768a635c4ea15a9f3b2a602cc6aac3e629e7480 (diff) | |
| download | ffmpeg-1894302a44f3babe736fabd78e168a70cb16ffac.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |