# HG changeset patch # User diego # Date 1175967450 0 # Node ID 66ef3690d108506477d3107bb7121fbc452cb97a # Parent d6b2ddac2c5e7733697092b10c6c595308beb938 Remove superfluous setting of has_b_frames in codecs without B-frames. patch by Nicholas Tung, ntung ntung com diff -r d6b2ddac2c5e -r 66ef3690d108 8bps.c --- a/8bps.c Sat Apr 07 16:03:23 2007 +0000 +++ b/8bps.c Sat Apr 07 17:37:30 2007 +0000 @@ -155,7 +155,6 @@ EightBpsContext * const c = (EightBpsContext *)avctx->priv_data; c->avctx = avctx; - avctx->has_b_frames = 0; c->pic.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 cinepak.c --- a/cinepak.c Sat Apr 07 16:03:23 2007 +0000 +++ b/cinepak.c Sat Apr 07 17:37:30 2007 +0000 @@ -407,7 +407,6 @@ avctx->pix_fmt = PIX_FMT_PAL8; } - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 cscd.c --- a/cscd.c Sat Apr 07 16:03:23 2007 +0000 +++ b/cscd.c Sat Apr 07 17:37:30 2007 +0000 @@ -218,7 +218,6 @@ if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { return 1; } - avctx->has_b_frames = 0; switch (avctx->bits_per_sample) { case 16: avctx->pix_fmt = PIX_FMT_RGB555; break; case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; diff -r d6b2ddac2c5e -r 66ef3690d108 cyuv.c --- a/cyuv.c Sat Apr 07 16:03:23 2007 +0000 +++ b/cyuv.c Sat Apr 07 17:37:30 2007 +0000 @@ -58,7 +58,6 @@ return -1; s->height = avctx->height; avctx->pix_fmt = PIX_FMT_YUV411P; - avctx->has_b_frames = 0; return 0; } diff -r d6b2ddac2c5e -r 66ef3690d108 dsicinav.c --- a/dsicinav.c Sat Apr 07 16:03:23 2007 +0000 +++ b/dsicinav.c Sat Apr 07 17:37:30 2007 +0000 @@ -93,7 +93,6 @@ cin->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; cin->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 flashsv.c --- a/flashsv.c Sat Apr 07 16:03:23 2007 +0000 +++ b/flashsv.c Sat Apr 07 17:37:30 2007 +0000 @@ -95,7 +95,6 @@ return 1; } avctx->pix_fmt = PIX_FMT_BGR24; - avctx->has_b_frames = 0; s->frame.data[0] = NULL; return 0; diff -r d6b2ddac2c5e -r 66ef3690d108 flicvideo.c --- a/flicvideo.c Sat Apr 07 16:03:23 2007 +0000 +++ b/flicvideo.c Sat Apr 07 17:37:30 2007 +0000 @@ -85,7 +85,6 @@ int depth; s->avctx = avctx; - avctx->has_b_frames = 0; s->fli_type = AV_RL16(&fli_header[4]); /* Might be overridden if a Magic Carpet FLC */ depth = AV_RL16(&fli_header[12]); diff -r d6b2ddac2c5e -r 66ef3690d108 fraps.c --- a/fraps.c Sat Apr 07 16:03:23 2007 +0000 +++ b/fraps.c Sat Apr 07 17:37:30 2007 +0000 @@ -73,7 +73,6 @@ FrapsContext * const s = avctx->priv_data; avctx->coded_frame = (AVFrame*)&s->frame; - avctx->has_b_frames = 0; avctx->pix_fmt= PIX_FMT_NONE; /* set in decode_frame */ s->avctx = avctx; diff -r d6b2ddac2c5e -r 66ef3690d108 idcinvideo.c --- a/idcinvideo.c Sat Apr 07 16:03:23 2007 +0000 +++ b/idcinvideo.c Sat Apr 07 17:37:30 2007 +0000 @@ -155,7 +155,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); /* make sure the Huffman tables make it */ diff -r d6b2ddac2c5e -r 66ef3690d108 indeo3.c --- a/indeo3.c Sat Apr 07 16:03:23 2007 +0000 +++ b/indeo3.c Sat Apr 07 17:37:30 2007 +0000 @@ -1066,7 +1066,6 @@ s->width = avctx->width; s->height = avctx->height; avctx->pix_fmt = PIX_FMT_YUV410P; - avctx->has_b_frames = 0; build_modpred(s); iv_alloc_frames(s); diff -r d6b2ddac2c5e -r 66ef3690d108 interplayvideo.c --- a/interplayvideo.c Sat Apr 07 16:03:23 2007 +0000 +++ b/interplayvideo.c Sat Apr 07 17:37:30 2007 +0000 @@ -865,7 +865,6 @@ } avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); /* decoding map contains 4 bits of information per 8x8 block */ diff -r d6b2ddac2c5e -r 66ef3690d108 lcl.c --- a/lcl.c Sat Apr 07 16:03:23 2007 +0000 +++ b/lcl.c Sat Apr 07 17:37:30 2007 +0000 @@ -624,7 +624,6 @@ int zret; // Zlib return code c->avctx = avctx; - avctx->has_b_frames = 0; c->pic.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 mmvideo.c --- a/mmvideo.c Sat Apr 07 16:03:23 2007 +0000 +++ b/mmvideo.c Sat Apr 07 17:37:30 2007 +0000 @@ -59,7 +59,6 @@ } avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; if (avcodec_check_dimensions(avctx, avctx->width, avctx->height)) return -1; diff -r d6b2ddac2c5e -r 66ef3690d108 msrle.c --- a/msrle.c Sat Apr 07 16:03:23 2007 +0000 +++ b/msrle.c Sat Apr 07 17:37:30 2007 +0000 @@ -244,7 +244,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; s->frame.data[0] = NULL; return 0; diff -r d6b2ddac2c5e -r 66ef3690d108 msvideo1.c --- a/msvideo1.c Sat Apr 07 16:03:23 2007 +0000 +++ b/msvideo1.c Sat Apr 07 17:37:30 2007 +0000 @@ -76,7 +76,6 @@ avctx->pix_fmt = PIX_FMT_RGB555; } - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 nuv.c --- a/nuv.c Sat Apr 07 16:03:23 2007 +0000 +++ b/nuv.c Sat Apr 07 17:37:30 2007 +0000 @@ -176,7 +176,6 @@ if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { return 1; } - avctx->has_b_frames = 0; avctx->pix_fmt = PIX_FMT_YUV420P; c->pic.data[0] = NULL; c->width = avctx->width; diff -r d6b2ddac2c5e -r 66ef3690d108 qtrle.c --- a/qtrle.c Sat Apr 07 16:03:23 2007 +0000 +++ b/qtrle.c Sat Apr 07 17:37:30 2007 +0000 @@ -523,7 +523,6 @@ avctx->bits_per_sample); break; } - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 roqvideo.c --- a/roqvideo.c Sat Apr 07 16:03:23 2007 +0000 +++ b/roqvideo.c Sat Apr 07 17:37:30 2007 +0000 @@ -411,7 +411,6 @@ s->last_frame = &s->frames[0]; s->current_frame = &s->frames[1]; avctx->pix_fmt = PIX_FMT_YUV420P; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); uiclp = uiclip+512; diff -r d6b2ddac2c5e -r 66ef3690d108 rpza.c --- a/rpza.c Sat Apr 07 16:03:23 2007 +0000 +++ b/rpza.c Sat Apr 07 17:37:30 2007 +0000 @@ -236,7 +236,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_RGB555; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 smacker.c --- a/smacker.c Sat Apr 07 16:03:23 2007 +0000 +++ b/smacker.c Sat Apr 07 17:37:30 2007 +0000 @@ -518,7 +518,6 @@ SmackVContext * const c = (SmackVContext *)avctx->priv_data; c->avctx = avctx; - avctx->has_b_frames = 0; c->pic.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 smc.c --- a/smc.c Sat Apr 07 16:03:23 2007 +0000 +++ b/smc.c Sat Apr 07 17:37:30 2007 +0000 @@ -436,7 +436,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 tiertexseqv.c --- a/tiertexseqv.c Sat Apr 07 16:03:23 2007 +0000 +++ b/tiertexseqv.c Sat Apr 07 17:37:30 2007 +0000 @@ -180,7 +180,6 @@ seq->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; seq->frame.data[0] = NULL; diff -r d6b2ddac2c5e -r 66ef3690d108 truemotion1.c --- a/truemotion1.c Sat Apr 07 16:03:23 2007 +0000 +++ b/truemotion1.c Sat Apr 07 17:37:30 2007 +0000 @@ -475,7 +475,6 @@ // else // avctx->pix_fmt = PIX_FMT_RGB555; - avctx->has_b_frames = 0; s->frame.data[0] = s->prev_frame.data[0] = NULL; /* there is a vertical predictor for each pixel in a line; each vertical diff -r d6b2ddac2c5e -r 66ef3690d108 vmdav.c --- a/vmdav.c Sat Apr 07 16:03:23 2007 +0000 +++ b/vmdav.c Sat Apr 07 17:37:30 2007 +0000 @@ -328,7 +328,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); /* make sure the VMD header made it */ diff -r d6b2ddac2c5e -r 66ef3690d108 vp3.c --- a/vp3.c Sat Apr 07 16:03:23 2007 +0000 +++ b/vp3.c Sat Apr 07 17:37:30 2007 +0000 @@ -1955,7 +1955,6 @@ s->width = (avctx->width + 15) & 0xFFFFFFF0; s->height = (avctx->height + 15) & 0xFFFFFFF0; avctx->pix_fmt = PIX_FMT_YUV420P; - avctx->has_b_frames = 0; if(avctx->idct_algo==FF_IDCT_AUTO) avctx->idct_algo=FF_IDCT_VP3; dsputil_init(&s->dsp, avctx); diff -r d6b2ddac2c5e -r 66ef3690d108 vqavideo.c --- a/vqavideo.c Sat Apr 07 16:03:23 2007 +0000 +++ b/vqavideo.c Sat Apr 07 17:37:30 2007 +0000 @@ -139,7 +139,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); /* make sure the extradata made it */ diff -r d6b2ddac2c5e -r 66ef3690d108 xan.c --- a/xan.c Sat Apr 07 16:03:23 2007 +0000 +++ b/xan.c Sat Apr 07 17:37:30 2007 +0000 @@ -70,7 +70,6 @@ } avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; if(avcodec_check_dimensions(avctx, avctx->width, avctx->height)) return -1;