libhb: fix crashes with some BDs

A stray line of code from the switch from mpeg2dec to
libavcodec caused a failure to open the mpeg2 decoder for BDs

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6009 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/bd.c b/libhb/bd.c
index 3f2a0df1cc232b38e2f48f838f8d490d191f0e9a..37c9c5c7e85a115ea99b0b8e7b939f0a64fb8491 100644 (file)
--- a/libhb/bd.c
+++ b/libhb/bd.c
@@ -339,7 +339,6 @@ hb_title_t * hb_bd_title_scan( hb_bd_t * d, int tt, uint64_t min_duration )
         case BLURAY_STREAM_TYPE_VIDEO_MPEG2:
             title->video_codec = WORK_DECAVCODECV;
             title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
-            title->video_codec_param = 0;
             break;
 
         case BLURAY_STREAM_TYPE_VIDEO_VC1:

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index b94168724dd4f7adb8bec02cce06ea8aa48b0d02..b4daf3cdcc4c15ecd7a4262d15277ccfcb56e5b2 100644 (file)
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -1953,6 +1953,9 @@ static int decavcodecvInfo( hb_work_object_t *w, hb_work_info_t *info )
 
     memset( info, 0, sizeof(*info) );
 
+    if (pv->context == NULL)
+        return 0;
+
     info->bitrate = pv->context->bit_rate;
     // HandBrake's video pipeline uses yuv420 color.  This means all
     // dimensions must be even.  So we must adjust the dimensions