diff -Nru handbrake-7411svnppa1~trusty1/debian/changelog handbrake-7412svnppa1~trusty1/debian/changelog
--- handbrake-7411svnppa1~trusty1/debian/changelog	2015-08-24 05:31:02.000000000 +0000
+++ handbrake-7412svnppa1~trusty1/debian/changelog	2015-08-25 05:31:08.000000000 +0000
@@ -1,4 +1,4 @@
-handbrake (7411svnppa1~trusty1) trusty; urgency=low
+handbrake (7412svnppa1~trusty1) trusty; urgency=low
   * Snapshot
     - See timeline at http://trac.handbrake.fr/timeline
 
diff -Nru handbrake-7411svnppa1~trusty1/libhb/cropscale.c handbrake-7412svnppa1~trusty1/libhb/cropscale.c
--- handbrake-7411svnppa1~trusty1/libhb/cropscale.c	2015-06-23 17:09:34.000000000 +0000
+++ handbrake-7412svnppa1~trusty1/libhb/cropscale.c	2015-08-24 15:40:24.000000000 +0000
@@ -202,6 +202,12 @@
             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 -Nru handbrake-7411svnppa1~trusty1/libhb/hb.c handbrake-7412svnppa1~trusty1/libhb/hb.c
--- handbrake-7411svnppa1~trusty1/libhb/hb.c	2015-07-22 17:12:13.000000000 +0000
+++ handbrake-7412svnppa1~trusty1/libhb/hb.c	2015-08-24 15:40:24.000000000 +0000
@@ -240,7 +240,7 @@
                       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;
         } 
diff -Nru handbrake-7411svnppa1~trusty1/version.txt handbrake-7412svnppa1~trusty1/version.txt
--- handbrake-7411svnppa1~trusty1/version.txt	2015-08-24 05:31:02.000000000 +0000
+++ handbrake-7412svnppa1~trusty1/version.txt	2015-08-25 05:31:07.000000000 +0000
@@ -3,9 +3,9 @@
 Relative URL: ^/trunk
 Repository Root: svn://svn.handbrake.fr/HandBrake
 Repository UUID: b64f7644-9d1e-0410-96f1-a4d463321fa5
-Revision: 7411
+Revision: 7412
 Node Kind: directory
-Last Changed Author: sr55
-Last Changed Rev: 7411
-Last Changed Date: 2015-08-23 14:17:52 -0700 (Sun, 23 Aug 2015)
+Last Changed Author: jstebbins
+Last Changed Rev: 7412
+Last Changed Date: 2015-08-24 08:40:24 -0700 (Mon, 24 Aug 2015)