Rename mpeg_set_pixelformat() as mpeg_get_pixelformat().
Originally committed as revision 16455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
ec0052760e
commit
448ecb68e3
@ -1212,7 +1212,7 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static enum PixelFormat mpeg_set_pixelformat(AVCodecContext *avctx){
|
static enum PixelFormat mpeg_get_pixelformat(AVCodecContext *avctx){
|
||||||
Mpeg1Context *s1 = avctx->priv_data;
|
Mpeg1Context *s1 = avctx->priv_data;
|
||||||
MpegEncContext *s = &s1->mpeg_enc_ctx;
|
MpegEncContext *s = &s1->mpeg_enc_ctx;
|
||||||
|
|
||||||
@ -1304,7 +1304,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){
|
|||||||
}
|
}
|
||||||
}//MPEG-2
|
}//MPEG-2
|
||||||
|
|
||||||
avctx->pix_fmt = mpeg_set_pixelformat(avctx);
|
avctx->pix_fmt = mpeg_get_pixelformat(avctx);
|
||||||
//until then pix_fmt may be changed right after codec init
|
//until then pix_fmt may be changed right after codec init
|
||||||
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
|
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
|
||||||
if( avctx->idct_algo == FF_IDCT_AUTO )
|
if( avctx->idct_algo == FF_IDCT_AUTO )
|
||||||
@ -2073,7 +2073,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
|
|||||||
avctx->has_b_frames= 0; //true?
|
avctx->has_b_frames= 0; //true?
|
||||||
s->low_delay= 1;
|
s->low_delay= 1;
|
||||||
|
|
||||||
avctx->pix_fmt = mpeg_set_pixelformat(avctx);
|
avctx->pix_fmt = mpeg_get_pixelformat(avctx);
|
||||||
|
|
||||||
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
|
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
|
||||||
if( avctx->idct_algo == FF_IDCT_AUTO )
|
if( avctx->idct_algo == FF_IDCT_AUTO )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user