virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

h264: use must_reinit to simplify code

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-19 21:39:14 +01:00
parent af0fafcb6f
commit ca4dd3810e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -2781,11 +2781,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s->avctx->pix_fmt = pix_fmt; s->avctx->pix_fmt = pix_fmt;
if (s->context_initialized && if (s->context_initialized &&
(s->width != s->avctx->coded_width || (
s->height != s->avctx->coded_height ||
pix_fmt != s->avctx->pix_fmt ||
needs_reinit || needs_reinit ||
av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { must_reinit)) {
if (h != h0) { if (h != h0) {
av_log(s->avctx, AV_LOG_ERROR, "changing width/height on " av_log(s->avctx, AV_LOG_ERROR, "changing width/height on "