[FFmpeg-cvslog] Fix standalone compilation of the iec61883 input device.

[Carl Eugen Hoyos]

ffmpeg | branch: release/2.5 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Dec  4 01:35:47 2014 +0100| [36e7385d0eb7e3f40040ad469a911b67dd86b8d0] | committer: Michael Niedermayer

Fix standalone compilation of the iec61883 input device.
(cherry picked from commit 963aa1daf88066d43c7495803b870800c5faaa4d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36e7385d0eb7e3f40040ad469a911b67dd86b8d0
---

 libavdevice/iec61883.c |    4 ++--
 libavformat/Makefile   |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c
index 0900ffa..b29aad1 100644
--- a/libavdevice/iec61883.c
+++ b/libavdevice/iec61883.c
@@ -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);
diff --git a/libavformat/Makefile b/libavformat/Makefile
index c1b5ace..f0900c4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -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