diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
new file mode 100644
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
@@ -0,0 +1,31 @@
+diff -ru mjpegtools-1.8.0-orig/scripts/lav2mpeg mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg
+--- mjpegtools-1.8.0-orig/scripts/lav2mpeg	2006-11-19 17:11:41.000000000 +0100
++++ mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg	2006-11-19 18:28:32.000000000 +0100
+@@ -253,7 +253,7 @@
+     esac
+ done
+ let MOPTIND=OPTIND-LAVRC_COUNT
+-shift `expr $MOPTIND-1`
++shift $((MOPTIND-1))
+ 
+ if [ "${QUIETLOG}" != "" ]; then
+    logfile=${QUIETLOG}
+@@ -267,7 +267,8 @@
+ 
+ # lavinfo should set up video_frames, video_width
+ # video_height, video_inter, video_norm, audio_chans
+-eval $($LAVINFO $@ | grep "=")  # grep for = to remove Warnings
++# Add backslashes to protect contained spaces
++eval $($LAVINFO $@ | grep "=" | sed -e 's: :\\ :g')  # grep for = to remove Warnings
+ if [ "$video_frames" == "" ]; then
+    logIt "'lavinfo $@' died! exiting"
+    logIt " maybe you don't have lavinfo. or your input flags were wrong"
+@@ -401,7 +402,7 @@
+    fi
+ fi
+ 
+-if [ $video_inter -eq 1 ]; then
++if [[ ${video_inter/interlacing/} != ${video_inter} ]]; then
+    yuvdenoise_flags="$yuvdenoise_flags -F"
+ fi
+