diff options
| author | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
| commit | 01d1b85d7adecdc588d5450ee43c52809c0b1c3f (patch) | |
| tree | 4f08f2381a18b4e62c4e5a82d7b610c68e8f1432 /libhb/work.c | |
| parent | b96ca4f7de03e2c1b2d6865a0ae65798c1afed6f (diff) | |
Bump libav to v9_beta3.
Miscellaneous bugfixes and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/work.c')
| -rw-r--r-- | libhb/work.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libhb/work.c b/libhb/work.c index 030920c59..c6ddd9472 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -140,19 +140,19 @@ hb_work_object_t * hb_codec_encoder( int codec ) case HB_ACODEC_FFAAC: { w = hb_get_work( WORK_ENCAVCODEC_AUDIO ); - w->codec_param = CODEC_ID_AAC; + w->codec_param = AV_CODEC_ID_AAC; return w; } case HB_ACODEC_FFFLAC: { w = hb_get_work( WORK_ENCAVCODEC_AUDIO ); - w->codec_param = CODEC_ID_FLAC; + w->codec_param = AV_CODEC_ID_FLAC; return w; } case HB_ACODEC_AC3: { w = hb_get_work( WORK_ENCAVCODEC_AUDIO ); - w->codec_param = CODEC_ID_AC3; + w->codec_param = AV_CODEC_ID_AC3; return w; } } @@ -696,7 +696,7 @@ static void do_job( hb_job_t * job ) hb_filter_init_t init; init.job = job; - init.pix_fmt = PIX_FMT_YUV420P; + init.pix_fmt = AV_PIX_FMT_YUV420P; init.width = title->width; init.height = title->height; init.par_width = job->anamorphic.par_width; @@ -995,7 +995,7 @@ static void do_job( hb_job_t * job ) if (vcodec == WORK_DECMPEG2) { vcodec = WORK_DECAVCODECV; - title->video_codec_param = CODEC_ID_MPEG2VIDEO; + title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO; } #endif hb_list_add( job->list_work, ( w = hb_get_work( vcodec ) ) ); @@ -1060,11 +1060,11 @@ static void do_job( hb_job_t * job ) { case HB_VCODEC_FFMPEG_MPEG4: w = hb_get_work( WORK_ENCAVCODEC ); - w->codec_param = CODEC_ID_MPEG4; + w->codec_param = AV_CODEC_ID_MPEG4; break; case HB_VCODEC_FFMPEG_MPEG2: w = hb_get_work( WORK_ENCAVCODEC ); - w->codec_param = CODEC_ID_MPEG2VIDEO; + w->codec_param = AV_CODEC_ID_MPEG2VIDEO; break; case HB_VCODEC_X264: w = hb_get_work( WORK_ENCX264 ); |