diff options
| author | jstebbins <[email protected]> | 2014-01-13 18:43:07 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-01-13 18:43:07 +0000 |
| commit | 1d137b47c62a47a4a08f13fc2bd8207633464fd5 (patch) | |
| tree | bb7c5c62e67d079a4c66220f25a0c6df3e2438af /libhb/work.c | |
| parent | cd00b6f50ede70a9edef1785dd8c74e1d3ab4dad (diff) | |
remove contrib mpeg2dec
We no longer need mpeg2dec. libav now has all the features we need
for mpeg2 decoding.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5966 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/work.c')
| -rw-r--r-- | libhb/work.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libhb/work.c b/libhb/work.c index 7bb8eab4f..05f76d46e 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -1154,16 +1154,12 @@ static void do_job(hb_job_t *job) sync = hb_sync_init( job ); /* Video decoder */ - int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2; -#if defined(USE_FF_MPEG2) - if (vcodec == WORK_DECMPEG2) + if (title->video_codec == WORK_NONE) { - vcodec = WORK_DECAVCODECV; - title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO; + hb_error("No video decoder set!"); + goto cleanup; } -#endif - - hb_list_add( job->list_work, ( w = hb_get_work( vcodec ) ) ); + hb_list_add(job->list_work, (w = hb_get_work(title->video_codec))); w->codec_param = title->video_codec_param; w->fifo_in = job->fifo_mpeg2; w->fifo_out = job->fifo_raw; |