cropscale: prevent crash when scale dimensions too small

This will result in no video in the output file, but in such cases, this
might actually be desirable.  Scaling to such small dimensions is often
used simply to re-encode audio.

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

2 files changed, 7 insertions, 1 deletions

diff --git a/libhb/cropscale.c b/libhb/cropscale.c
index 548bdcc2e..a8a995a6c 100644
--- a/libhb/cropscale.c
+++ b/libhb/cropscale.c
@@ -202,6 +202,12 @@ static hb_buffer_t* crop_scale( hb_filter_private_t * pv, hb_buffer_t * in )
             pv->pix_fmt   = in->f.fmt;
         }
         
+        if (pv->context == NULL)
+        {
+            hb_buffer_close(&out);
+            return NULL;
+        }
+
         // Scale pic_crop into pic_render according to the
         // context set up above
         sws_scale(pv->context,
diff --git a/libhb/hb.c b/libhb/hb.c
index ab61ff74e..e8418e741 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -240,7 +240,7 @@ hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat,
                       1 << 16 ); // saturation
 
         if (sws_init_context(ctx, NULL, NULL) < 0) {
-            fprintf(stderr, "Cannot initialize resampling context\n");
+            hb_error("Cannot initialize resampling context");
             sws_freeContext(ctx);
             ctx = NULL;
         }