[Ffmpeg-cvslog] r8647 - in trunk/libavcodec: 8bps.c cinepak.c cscd.c cyuv.c dsicinav.c flashsv.c flicvideo.c fraps.c idcinvideo.c indeo3.c interplayvideo.c lcl.c mmvideo.c msrle.c msvideo1.c nuv.c qtrle.c roqvideo.c rpza.c smacker.c smc.c tiertexseqv.c truemotion1.c vmdav.c vp3.c vqavideo.c xan.c
diego
subversion
Sat Apr 7 19:37:30 CEST 2007
Author: diego
Date: Sat Apr 7 19:37:30 2007
New Revision: 8647
Modified:
trunk/libavcodec/8bps.c
trunk/libavcodec/cinepak.c
trunk/libavcodec/cscd.c
trunk/libavcodec/cyuv.c
trunk/libavcodec/dsicinav.c
trunk/libavcodec/flashsv.c
trunk/libavcodec/flicvideo.c
trunk/libavcodec/fraps.c
trunk/libavcodec/idcinvideo.c
trunk/libavcodec/indeo3.c
trunk/libavcodec/interplayvideo.c
trunk/libavcodec/lcl.c
trunk/libavcodec/mmvideo.c
trunk/libavcodec/msrle.c
trunk/libavcodec/msvideo1.c
trunk/libavcodec/nuv.c
trunk/libavcodec/qtrle.c
trunk/libavcodec/roqvideo.c
trunk/libavcodec/rpza.c
trunk/libavcodec/smacker.c
trunk/libavcodec/smc.c
trunk/libavcodec/tiertexseqv.c
trunk/libavcodec/truemotion1.c
trunk/libavcodec/vmdav.c
trunk/libavcodec/vp3.c
trunk/libavcodec/vqavideo.c
trunk/libavcodec/xan.c
Log:
Remove superfluous setting of has_b_frames in codecs without B-frames.
patch by Nicholas Tung, ntung ntung com
Modified: trunk/libavcodec/8bps.c
==============================================================================
--- trunk/libavcodec/8bps.c (original)
+++ trunk/libavcodec/8bps.c Sat Apr 7 19:37:30 2007
@@ -155,7 +155,6 @@ static int decode_init(AVCodecContext *a
EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
c->avctx = avctx;
- avctx->has_b_frames = 0;
c->pic.data[0] = NULL;
Modified: trunk/libavcodec/cinepak.c
==============================================================================
--- trunk/libavcodec/cinepak.c (original)
+++ trunk/libavcodec/cinepak.c Sat Apr 7 19:37:30 2007
@@ -407,7 +407,6 @@ static int cinepak_decode_init(AVCodecCo
avctx->pix_fmt = PIX_FMT_PAL8;
}
- avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
Modified: trunk/libavcodec/cscd.c
==============================================================================
--- trunk/libavcodec/cscd.c (original)
+++ trunk/libavcodec/cscd.c Sat Apr 7 19:37:30 2007
@@ -218,7 +218,6 @@ static int decode_init(AVCodecContext *a
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;
Modified: trunk/libavcodec/cyuv.c
==============================================================================
--- trunk/libavcodec/cyuv.c (original)
+++ trunk/libavcodec/cyuv.c Sat Apr 7 19:37:30 2007
@@ -58,7 +58,6 @@ static int cyuv_decode_init(AVCodecConte
return -1;
s->height = avctx->height;
avctx->pix_fmt = PIX_FMT_YUV411P;
- avctx->has_b_frames = 0;
return 0;
}
Modified: trunk/libavcodec/dsicinav.c
==============================================================================
--- trunk/libavcodec/dsicinav.c (original)
+++ trunk/libavcodec/dsicinav.c Sat Apr 7 19:37:30 2007
@@ -93,7 +93,6 @@ static int cinvideo_decode_init(AVCodecC
cin->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
cin->frame.data[0] = NULL;
Modified: trunk/libavcodec/flashsv.c
==============================================================================
--- trunk/libavcodec/flashsv.c (original)
+++ trunk/libavcodec/flashsv.c Sat Apr 7 19:37:30 2007
@@ -95,7 +95,6 @@ static int flashsv_decode_init(AVCodecCo
return 1;
}
avctx->pix_fmt = PIX_FMT_BGR24;
- avctx->has_b_frames = 0;
s->frame.data[0] = NULL;
return 0;
Modified: trunk/libavcodec/flicvideo.c
==============================================================================
--- trunk/libavcodec/flicvideo.c (original)
+++ trunk/libavcodec/flicvideo.c Sat Apr 7 19:37:30 2007
@@ -85,7 +85,6 @@ static int flic_decode_init(AVCodecConte
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]);
Modified: trunk/libavcodec/fraps.c
==============================================================================
--- trunk/libavcodec/fraps.c (original)
+++ trunk/libavcodec/fraps.c Sat Apr 7 19:37:30 2007
@@ -73,7 +73,6 @@ static int decode_init(AVCodecContext *a
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;
Modified: trunk/libavcodec/idcinvideo.c
==============================================================================
--- trunk/libavcodec/idcinvideo.c (original)
+++ trunk/libavcodec/idcinvideo.c Sat Apr 7 19:37:30 2007
@@ -155,7 +155,6 @@ static int idcin_decode_init(AVCodecCont
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 */
Modified: trunk/libavcodec/indeo3.c
==============================================================================
--- trunk/libavcodec/indeo3.c (original)
+++ trunk/libavcodec/indeo3.c Sat Apr 7 19:37:30 2007
@@ -1066,7 +1066,6 @@ static int indeo3_decode_init(AVCodecCon
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);
Modified: trunk/libavcodec/interplayvideo.c
==============================================================================
--- trunk/libavcodec/interplayvideo.c (original)
+++ trunk/libavcodec/interplayvideo.c Sat Apr 7 19:37:30 2007
@@ -865,7 +865,6 @@ static int ipvideo_decode_init(AVCodecCo
}
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 */
Modified: trunk/libavcodec/lcl.c
==============================================================================
--- trunk/libavcodec/lcl.c (original)
+++ trunk/libavcodec/lcl.c Sat Apr 7 19:37:30 2007
@@ -624,7 +624,6 @@ static int decode_init(AVCodecContext *a
int zret; // Zlib return code
c->avctx = avctx;
- avctx->has_b_frames = 0;
c->pic.data[0] = NULL;
Modified: trunk/libavcodec/mmvideo.c
==============================================================================
--- trunk/libavcodec/mmvideo.c (original)
+++ trunk/libavcodec/mmvideo.c Sat Apr 7 19:37:30 2007
@@ -59,7 +59,6 @@ static int mm_decode_init(AVCodecContext
}
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
if (avcodec_check_dimensions(avctx, avctx->width, avctx->height))
return -1;
Modified: trunk/libavcodec/msrle.c
==============================================================================
--- trunk/libavcodec/msrle.c (original)
+++ trunk/libavcodec/msrle.c Sat Apr 7 19:37:30 2007
@@ -244,7 +244,6 @@ static int msrle_decode_init(AVCodecCont
s->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
s->frame.data[0] = NULL;
return 0;
Modified: trunk/libavcodec/msvideo1.c
==============================================================================
--- trunk/libavcodec/msvideo1.c (original)
+++ trunk/libavcodec/msvideo1.c Sat Apr 7 19:37:30 2007
@@ -76,7 +76,6 @@ static int msvideo1_decode_init(AVCodecC
avctx->pix_fmt = PIX_FMT_RGB555;
}
- avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
Modified: trunk/libavcodec/nuv.c
==============================================================================
--- trunk/libavcodec/nuv.c (original)
+++ trunk/libavcodec/nuv.c Sat Apr 7 19:37:30 2007
@@ -176,7 +176,6 @@ static int decode_init(AVCodecContext *a
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;
Modified: trunk/libavcodec/qtrle.c
==============================================================================
--- trunk/libavcodec/qtrle.c (original)
+++ trunk/libavcodec/qtrle.c Sat Apr 7 19:37:30 2007
@@ -523,7 +523,6 @@ static int qtrle_decode_init(AVCodecCont
avctx->bits_per_sample);
break;
}
- avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
Modified: trunk/libavcodec/roqvideo.c
==============================================================================
--- trunk/libavcodec/roqvideo.c (original)
+++ trunk/libavcodec/roqvideo.c Sat Apr 7 19:37:30 2007
@@ -411,7 +411,6 @@ static int roq_decode_init(AVCodecContex
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;
Modified: trunk/libavcodec/rpza.c
==============================================================================
--- trunk/libavcodec/rpza.c (original)
+++ trunk/libavcodec/rpza.c Sat Apr 7 19:37:30 2007
@@ -236,7 +236,6 @@ static int rpza_decode_init(AVCodecConte
s->avctx = avctx;
avctx->pix_fmt = PIX_FMT_RGB555;
- avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
Modified: trunk/libavcodec/smacker.c
==============================================================================
--- trunk/libavcodec/smacker.c (original)
+++ trunk/libavcodec/smacker.c Sat Apr 7 19:37:30 2007
@@ -518,7 +518,6 @@ static int decode_init(AVCodecContext *a
SmackVContext * const c = (SmackVContext *)avctx->priv_data;
c->avctx = avctx;
- avctx->has_b_frames = 0;
c->pic.data[0] = NULL;
Modified: trunk/libavcodec/smc.c
==============================================================================
--- trunk/libavcodec/smc.c (original)
+++ trunk/libavcodec/smc.c Sat Apr 7 19:37:30 2007
@@ -436,7 +436,6 @@ static int smc_decode_init(AVCodecContex
s->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
Modified: trunk/libavcodec/tiertexseqv.c
==============================================================================
--- trunk/libavcodec/tiertexseqv.c (original)
+++ trunk/libavcodec/tiertexseqv.c Sat Apr 7 19:37:30 2007
@@ -180,7 +180,6 @@ static int seqvideo_decode_init(AVCodecC
seq->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
seq->frame.data[0] = NULL;
Modified: trunk/libavcodec/truemotion1.c
==============================================================================
--- trunk/libavcodec/truemotion1.c (original)
+++ trunk/libavcodec/truemotion1.c Sat Apr 7 19:37:30 2007
@@ -475,7 +475,6 @@ static int truemotion1_decode_init(AVCod
// 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
Modified: trunk/libavcodec/vmdav.c
==============================================================================
--- trunk/libavcodec/vmdav.c (original)
+++ trunk/libavcodec/vmdav.c Sat Apr 7 19:37:30 2007
@@ -328,7 +328,6 @@ static int vmdvideo_decode_init(AVCodecC
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 */
Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c (original)
+++ trunk/libavcodec/vp3.c Sat Apr 7 19:37:30 2007
@@ -1955,7 +1955,6 @@ static int vp3_decode_init(AVCodecContex
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);
Modified: trunk/libavcodec/vqavideo.c
==============================================================================
--- trunk/libavcodec/vqavideo.c (original)
+++ trunk/libavcodec/vqavideo.c Sat Apr 7 19:37:30 2007
@@ -139,7 +139,6 @@ static int vqa_decode_init(AVCodecContex
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 */
Modified: trunk/libavcodec/xan.c
==============================================================================
--- trunk/libavcodec/xan.c (original)
+++ trunk/libavcodec/xan.c Sat Apr 7 19:37:30 2007
@@ -70,7 +70,6 @@ static int xan_decode_init(AVCodecContex
}
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
if(avcodec_check_dimensions(avctx, avctx->width, avctx->height))
return -1;
More information about the ffmpeg-cvslog
mailing list