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/scan.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/scan.c')
| -rw-r--r-- | libhb/scan.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libhb/scan.c b/libhb/scan.c index cc36fe5da..833589f6c 100644 --- a/libhb/scan.c +++ b/libhb/scan.c @@ -517,15 +517,12 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title ) data->stream = hb_stream_open( title->path, title, 1 ); } - 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!"); + return 0; } -#endif - hb_work_object_t *vid_decoder = hb_get_work( vcodec ); + hb_work_object_t *vid_decoder = hb_get_work(title->video_codec); vid_decoder->codec_param = title->video_codec_param; vid_decoder->title = title; vid_decoder->init( vid_decoder, NULL ); |