Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename mpeg_set_pixelformat() as mpeg_get_pixelformat().

Browse Source 
Originally committed as revision 16455 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Carl Eugen Hoyos 16 years ago
parent ec0052760e
commit 448ecb68e3
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/mpeg12.c

6
libavcodec/mpeg12.c
Unescape View File

@ -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 )

Write Preview
Loading…
Cancel
Save