Remove superfluous setting of has_b_frames in codecs without B-frames.

patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 3d4eb05..5f68fcc 100644 (file)
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -155,7 +155,6 @@ static int decode_init(AVCodecContext *avctx)
         EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
 
         c->avctx = avctx;
-        avctx->has_b_frames = 0;
 
         c->pic.data[0] = NULL;
 

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index db0519b..5a6de93 100644 (file)
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -407,7 +407,6 @@ static int cinepak_decode_init(AVCodecContext *avctx)
         avctx->pix_fmt = PIX_FMT_PAL8;
     }
 
-    avctx->has_b_frames = 0;
     dsputil_init(&s->dsp, avctx);
 
     s->frame.data[0] = NULL;

diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 2e7d05c..bda359f 100644 (file)
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -218,7 +218,6 @@ static int decode_init(AVCodecContext *avctx) {
     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 --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index 101f2bd..4d625e0 100644 (file)
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -58,7 +58,6 @@ static int cyuv_decode_init(AVCodecContext *avctx)
         return -1;
     s->height = avctx->height;
     avctx->pix_fmt = PIX_FMT_YUV411P;
-    avctx->has_b_frames = 0;
 
     return 0;
 }

diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index c7c3f56..df2db86 100644 (file)
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -93,7 +93,6 @@ static int cinvideo_decode_init(AVCodecContext *avctx)
 
     cin->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;
-    avctx->has_b_frames = 0;
 
     cin->frame.data[0] = NULL;
 

diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 9e4aa95..515085c 100644 (file)
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -95,7 +95,6 @@ static int flashsv_decode_init(AVCodecContext *avctx)
         return 1;
     }
     avctx->pix_fmt = PIX_FMT_BGR24;
-    avctx->has_b_frames = 0;
     s->frame.data[0] = NULL;
 
     return 0;

diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index b60e0b1..9f8732a 100644 (file)
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -85,7 +85,6 @@ static int flic_decode_init(AVCodecContext *avctx)
     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 --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 0a4567d..1f71327 100644 (file)
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -73,7 +73,6 @@ static int decode_init(AVCodecContext *avctx)
     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 --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 112da7b..a24f5e2 100644 (file)
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -155,7 +155,6 @@ static int idcin_decode_init(AVCodecContext *avctx)
 
     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 --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 1b19144..bd33d6d 100644 (file)
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -1066,7 +1066,6 @@ static int indeo3_decode_init(AVCodecContext *avctx)
     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 --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 95059c3..a79e323 100644 (file)
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -865,7 +865,6 @@ static int ipvideo_decode_init(AVCodecContext *avctx)
     }
 
     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 --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index b02ea15..b236c10 100644 (file)
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -624,7 +624,6 @@ static int decode_init(AVCodecContext *avctx)
     int zret; // Zlib return code
 
     c->avctx = avctx;
-    avctx->has_b_frames = 0;
 
     c->pic.data[0] = NULL;
 

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 7ba1321..82ea02d 100644 (file)
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -59,7 +59,6 @@ static int mm_decode_init(AVCodecContext *avctx)
     }
 
     avctx->pix_fmt = PIX_FMT_PAL8;
-    avctx->has_b_frames = 0;
 
     if (avcodec_check_dimensions(avctx, avctx->width, avctx->height))
         return -1;

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index fae5616..ce1d373 100644 (file)
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -244,7 +244,6 @@ static int msrle_decode_init(AVCodecContext *avctx)
     s->avctx = avctx;
 
     avctx->pix_fmt = PIX_FMT_PAL8;
-    avctx->has_b_frames = 0;
     s->frame.data[0] = NULL;
 
     return 0;

diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 1e3f6cc..531d0fc 100644 (file)
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -76,7 +76,6 @@ static int msvideo1_decode_init(AVCodecContext *avctx)
         avctx->pix_fmt = PIX_FMT_RGB555;
     }
 
-    avctx->has_b_frames = 0;
     dsputil_init(&s->dsp, avctx);
 
     s->frame.data[0] = NULL;

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 5989c6c..c22618d 100644 (file)
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -176,7 +176,6 @@ static int decode_init(AVCodecContext *avctx) {
     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 --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 415f080..b631122 100644 (file)
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -523,7 +523,6 @@ static int qtrle_decode_init(AVCodecContext *avctx)
             avctx->bits_per_sample);
         break;
     }
-    avctx->has_b_frames = 0;
     dsputil_init(&s->dsp, avctx);
 
     s->frame.data[0] = NULL;

diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c
index 2a9aa62..0ac97b2 100644 (file)
--- a/libavcodec/roqvideo.c
+++ b/libavcodec/roqvideo.c
@@ -411,7 +411,6 @@ static int roq_decode_init(AVCodecContext *avctx)
     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 --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index 8ab5dbb..a97cf18 100644 (file)
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -236,7 +236,6 @@ static int rpza_decode_init(AVCodecContext *avctx)
 
     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 --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 0dd7610..ad1d447 100644 (file)
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -518,7 +518,6 @@ static int decode_init(AVCodecContext *avctx)
     SmackVContext * const c = (SmackVContext *)avctx->priv_data;
 
     c->avctx = avctx;
-    avctx->has_b_frames = 0;
 
     c->pic.data[0] = NULL;
 

diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index 349e5f8..8cafa66 100644 (file)
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -436,7 +436,6 @@ static int smc_decode_init(AVCodecContext *avctx)
 
     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 --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index ca3baf0..5343d5f 100644 (file)
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -180,7 +180,6 @@ static int seqvideo_decode_init(AVCodecContext *avctx)
 
     seq->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;
-    avctx->has_b_frames = 0;
 
     seq->frame.data[0] = NULL;
 

diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index a7d3544..b0fb76f 100644 (file)
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -475,7 +475,6 @@ static int truemotion1_decode_init(AVCodecContext *avctx)
 //    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 --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 69e8a44..746ae9d 100644 (file)
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -328,7 +328,6 @@ static int vmdvideo_decode_init(AVCodecContext *avctx)
 
     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 --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 0d882da..a1b1bac 100644 (file)
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1955,7 +1955,6 @@ static int vp3_decode_init(AVCodecContext *avctx)
     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 --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 57fe6cf..ced7f3d 100644 (file)
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -139,7 +139,6 @@ static int vqa_decode_init(AVCodecContext *avctx)
 
     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 --git a/libavcodec/xan.c b/libavcodec/xan.c
index 6e295e5..49bb981 100644 (file)
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -70,7 +70,6 @@ static int xan_decode_init(AVCodecContext *avctx)
     }
 
     avctx->pix_fmt = PIX_FMT_PAL8;
-    avctx->has_b_frames = 0;
 
     if(avcodec_check_dimensions(avctx, avctx->width, avctx->height))
         return -1;