diff --git mjpegtools.orig/lavtools/Makefile.in mjpegtools/lavtools/Makefile.in
index 1f8e217..20b68c3 100644
--- mjpegtools.orig/lavtools/Makefile.in
+++ mjpegtools/lavtools/Makefile.in
@@ -84,19 +84,19 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
 	"$(DESTDIR)$(liblavincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-liblavfile_la_LIBADD =
+liblavfile_la_LIBADD = -L../utils/.libs -lmjpegutils
 am_liblavfile_la_OBJECTS = liblavfile_la-editlist.lo \
 	liblavfile_la-lav_io.lo liblavfile_la-avilib.lo
 liblavfile_la_OBJECTS = $(am_liblavfile_la_OBJECTS)
-liblavjpeg_la_LIBADD =
+liblavjpeg_la_LIBADD = -L../utils/.libs -lmjpegutils
 am_liblavjpeg_la_OBJECTS = liblavjpeg_la-jpegutils.lo
 liblavjpeg_la_OBJECTS = $(am_liblavjpeg_la_OBJECTS)
-liblavplay_la_LIBADD =
+liblavplay_la_LIBADD = -L../utils/.libs -L./.libs -lmjpegutils -llavfile -llavjpeg -lSDL -lX11
 am_liblavplay_la_OBJECTS = liblavplay_la-liblavplay.lo \
 	liblavplay_la-audiolib.lo
 liblavplay_la_OBJECTS = $(am_liblavplay_la_OBJECTS)
 @HAVE_V4L_OR_SDL_TRUE@am_liblavplay_la_rpath = -rpath $(libdir)
-liblavrec_la_LIBADD =
+liblavrec_la_LIBADD = -L../utils/.libs -L./.libs -lmjpegutils -llavfile -llavjpeg -lSDL
 am_liblavrec_la_OBJECTS = liblavrec_la-liblavrec.lo \
 	liblavrec_la-audiolib.lo liblavrec_la-frequencies.lo
 liblavrec_la_OBJECTS = $(am_liblavrec_la_OBJECTS)
diff --git mjpegtools.orig/lavtools/lav_io.c mjpegtools/lavtools/lav_io.c
index e0f38d1..03e0bc1 100644
--- mjpegtools.orig/lavtools/lav_io.c
+++ mjpegtools/lavtools/lav_io.c
@@ -1367,7 +1367,7 @@ int lav_fileno(lav_file_t *lav_file)
          break;
 #ifdef HAVE_LIBQUICKTIME
       case 'q':
-         res = fileno(((quicktime_t *)lav_file->qt_fd)->stream);
+         res = lqt_fileno(lav_file->qt_fd);
          break;
 #endif
       default: