diff options
| author | jstebbins <[email protected]> | 2011-06-10 18:20:30 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-06-10 18:20:30 +0000 |
| commit | bf638bca8ae57005b4d570b4260d10af45d1c7a0 (patch) | |
| tree | 582f371110d7a1ab53b0ee107d3f35599b9495b7 /libhb/decavcodec.c | |
| parent | 8b804a5e65b322aa2a0cbbfd43e0c54b62b5f5f5 (diff) | |
libhb: clean up AVCodecContext initializations
also fixes warning message generated by libav when initializing "silence"
sample about channel layout setting.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4038 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/decavcodec.c')
| -rw-r--r-- | libhb/decavcodec.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 6d9632bab..770a7914e 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -203,8 +203,7 @@ static int decavcodecInit( hb_work_object_t * w, hb_job_t * job ) codec = avcodec_find_decoder( codec_id ); pv->parser = av_parser_init( codec_id ); - pv->context = avcodec_alloc_context(); - avcodec_get_context_defaults3(pv->context, codec); + pv->context = avcodec_alloc_context3(codec); hb_ff_set_sample_fmt( pv->context, codec ); hb_avcodec_open( pv->context, codec, 0 ); @@ -522,8 +521,7 @@ static int decavcodecBSInfo( hb_work_object_t *w, const hb_buffer_t *buf, info->name = strncpy( codec_name, codec->name, sizeof(codec_name)-1 ); AVCodecParserContext *parser = av_parser_init( codec->id ); - AVCodecContext *context = avcodec_alloc_context(); - avcodec_get_context_defaults3(context, codec); + AVCodecContext *context = avcodec_alloc_context3(codec); hb_ff_set_sample_fmt( context, codec ); hb_avcodec_open( context, codec, 0 ); uint8_t *buffer = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE ); @@ -1150,6 +1148,9 @@ static int decavcodecvWork( hb_work_object_t * w, hb_buffer_t ** buf_in, // first frame because of M$ VC1 braindamage). if ( pv->context->extradata == NULL ) { + AVCodec *codec = avcodec_find_decoder( w->codec_param ); + avcodec_get_context_defaults3( pv->context, codec ); + hb_ff_set_sample_fmt( pv->context, codec ); if ( setup_extradata( w, in ) ) { // we didn't find the headers needed to set up extradata. @@ -1158,11 +1159,9 @@ static int decavcodecvWork( hb_work_object_t * w, hb_buffer_t ** buf_in, hb_buffer_close( &in ); return HB_WORK_OK; } - AVCodec *codec = avcodec_find_decoder( w->codec_param ); // There's a mis-feature in ffmpeg that causes the context to be // incorrectly initialized the 1st time avcodec_open is called. // If you close it and open a 2nd time, it finishes the job. - hb_ff_set_sample_fmt( pv->context, codec ); hb_avcodec_open( pv->context, codec, 0 ); hb_avcodec_close( pv->context ); // disable threaded decoding for scan, can cause crashes |