diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-12-04 01:35:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-04 01:58:28 +0100 |
| commit | 36e7385d0eb7e3f40040ad469a911b67dd86b8d0 (patch) | |
| tree | 1d44d8eca56a72660c072e2f9fcabb3a72d43ebf | |
| parent | 5108323aa90fac4a491a608b563cfcf11bea4b79 (diff) | |
| download | ffmpeg-36e7385d0eb7e3f40040ad469a911b67dd86b8d0.tar.gz | |
Fix standalone compilation of the iec61883 input device.
(cherry picked from commit 963aa1daf88066d43c7495803b870800c5faaa4d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/iec61883.c | 4 | ||||
| -rw-r--r-- | libavformat/Makefile | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index 0900ffadf7..b29aad1d48 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 c1b5acee93..f0900c4343 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 |