Fix standalone compilation of the iec61883 input device.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 4 Dec 2014 00:35:47 +0000 (01:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Dec 2014 00:58:28 +0000 (01:58 +0100)
(cherry picked from commit 963aa1daf88066d43c7495803b870800c5faaa4d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/iec61883.c
libavformat/Makefile

index 0900ffa..b29aad1 100644 (file)
@@ -350,7 +350,7 @@ static int iec61883_read_header(AVFormatContext *context)
     if (!dv->max_packets)
         dv->max_packets = 100;
 
-    if (dv->type == IEC61883_HDV) {
+    if (CONFIG_MPEGTS_DEMUXER && dv->type == IEC61883_HDV) {
 
         /* Init HDV receive */
 
@@ -444,7 +444,7 @@ static int iec61883_close(AVFormatContext *context)
     pthread_mutex_destroy(&dv->mutex);
 #endif
 
-    if (dv->type == IEC61883_HDV) {
+    if (CONFIG_MPEGTS_DEMUXER && dv->type == IEC61883_HDV) {
         iec61883_mpeg2_recv_stop(dv->iec61883_mpeg2);
         iec61883_mpeg2_close(dv->iec61883_mpeg2);
         avpriv_mpegts_parse_close(dv->mpeg_demux);
index c1b5ace..f0900c4 100644 (file)
@@ -519,6 +519,9 @@ OBJS-$(CONFIG_UNIX_PROTOCOL)             += unix.o
 
 OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 
+# libavdevice dependencies
+OBJS-$(CONFIG_IEC61883_INDEV)            += dv.o
+
 # Windows resource file
 SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o