Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
sixue.cheng
FFmpeg
Commits
963aa1da
Commit
963aa1da
authored
10 years ago
by
Carl Eugen Hoyos
Browse files
Options
Download
Email Patches
Plain Diff
Fix standalone compilation of the iec61883 input device.
parent
1d69ab9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavdevice/iec61883.c
+2
-2
libavdevice/iec61883.c
libavformat/Makefile
+3
-0
libavformat/Makefile
with
5 additions
and
2 deletions
+5
-2
libavdevice/iec61883.c
+
2
-
2
View file @
963aa1da
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
libavformat/Makefile
+
3
-
0
View file @
963aa1da
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment