summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Tung <ntung@ntung.com>2007-04-07 17:37:30 +0000
committerDiego Biurrun <diego@biurrun.de>2007-04-07 17:37:30 +0000
commit587d07227eed8021ac38dc352ba72ee5b6714380 (patch)
tree5847ed38addd253658a09d052fa507eeb4cd53c1
parentd1e0d21f9492215b324fe7872e050b2d48a55c1d (diff)
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
-rw-r--r--libavcodec/8bps.c1
-rw-r--r--libavcodec/cinepak.c1
-rw-r--r--libavcodec/cscd.c1
-rw-r--r--libavcodec/cyuv.c1
-rw-r--r--libavcodec/dsicinav.c1
-rw-r--r--libavcodec/flashsv.c1
-rw-r--r--libavcodec/flicvideo.c1
-rw-r--r--libavcodec/fraps.c1
-rw-r--r--libavcodec/idcinvideo.c1
-rw-r--r--libavcodec/indeo3.c1
-rw-r--r--libavcodec/interplayvideo.c1
-rw-r--r--libavcodec/lcl.c1
-rw-r--r--libavcodec/mmvideo.c1
-rw-r--r--libavcodec/msrle.c1
-rw-r--r--libavcodec/msvideo1.c1
-rw-r--r--libavcodec/nuv.c1
-rw-r--r--libavcodec/qtrle.c1
-rw-r--r--libavcodec/roqvideo.c1
-rw-r--r--libavcodec/rpza.c1
-rw-r--r--libavcodec/smacker.c1
-rw-r--r--libavcodec/smc.c1
-rw-r--r--libavcodec/tiertexseqv.c1
-rw-r--r--libavcodec/truemotion1.c1
-rw-r--r--libavcodec/vmdav.c1
-rw-r--r--libavcodec/vp3.c1
-rw-r--r--libavcodec/vqavideo.c1
-rw-r--r--libavcodec/xan.c1
27 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 3d4eb05b36..5f68fcc039 100644
--- 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 db0519b5db..5a6de9309d 100644
--- 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 2e7d05c402..bda359f597 100644
--- 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 101f2bd851..4d625e08fb 100644
--- 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 c7c3f56273..df2db86b9b 100644
--- 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 9e4aa951ae..515085c028 100644
--- 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 b60e0b1c23..9f8732ae3d 100644
--- 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 0a4567d053..1f71327dcf 100644
--- 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 112da7bc6b..a24f5e2d01 100644
--- 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 1b19144065..bd33d6da94 100644
--- 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 95059c365d..a79e32383b 100644
--- 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 b02ea1543f..b236c1092b 100644
--- 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 7ba1321cb2..82ea02dac7 100644
--- 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 fae5616e51..ce1d3737f3 100644
--- 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 1e3f6cce23..531d0fc6f6 100644
--- 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 5989c6cc20..c22618d9f8 100644
--- 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 415f08098e..b63112221d 100644
--- 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 2a9aa6242e..0ac97b297c 100644
--- 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 8ab5dbb92d..a97cf18e65 100644
--- 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 0dd76107b8..ad1d447dcc 100644
--- 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 349e5f81cb..8cafa6682b 100644
--- 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 ca3baf09ef..5343d5fa52 100644
--- 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 a7d3544f4b..b0fb76f2ce 100644
--- 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 69e8a44d3c..746ae9dbac 100644
--- 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 0d882da326..a1b1baccea 100644
--- 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 57fe6cf44b..ced7f3dcd0 100644
--- 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 6e295e5b55..49bb981bf6 100644
--- 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;