diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/combined/Makefile.am | 2 | ||||
| -rw-r--r-- | src/combined/ffmpeg/Makefile.am (renamed from src/libffmpeg/Makefile.am) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c (renamed from src/libffmpeg/ff_audio_decoder.c) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_dvaudio_decoder.c (renamed from src/libffmpeg/ff_dvaudio_decoder.c) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_mpeg_parser.c (renamed from src/libffmpeg/ff_mpeg_parser.c) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_mpeg_parser.h (renamed from src/libffmpeg/ff_mpeg_parser.h) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c (renamed from src/libffmpeg/ff_video_decoder.c) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.c (renamed from src/libffmpeg/ffmpeg_decoder.c) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.h (renamed from src/libffmpeg/ffmpeg_decoder.h) | 0 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_encoder.c (renamed from src/libffmpeg/ffmpeg_encoder.c) | 0 |
12 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4b7a0dd97..bcb6fff25 100644 --- a/configure.ac +++ b/configure.ac @@ -1169,6 +1169,7 @@ src/Makefile src/audio_out/Makefile src/audio_dec/Makefile src/combined/Makefile +src/combined/ffmpeg/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile @@ -1176,7 +1177,6 @@ src/input/libdvdnav/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile -src/libffmpeg/Makefile src/libmpeg2/Makefile src/libspudec/Makefile src/libspucc/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 330b099a0..4b16acb35 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS = \ dxr3 \ input \ demuxers \ - libffmpeg \ libmpeg2 \ libspudec \ libspucc \ diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am index 0784b8044..92d49a3e5 100644 --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = ffmpeg + include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) diff --git a/src/libffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index 42fe20f95..42fe20f95 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index dd03cd2a3..dd03cd2a3 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/combined/ffmpeg/ff_dvaudio_decoder.c index aced7f5bb..aced7f5bb 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/combined/ffmpeg/ff_dvaudio_decoder.c diff --git a/src/libffmpeg/ff_mpeg_parser.c b/src/combined/ffmpeg/ff_mpeg_parser.c index 70901d93b..70901d93b 100644 --- a/src/libffmpeg/ff_mpeg_parser.c +++ b/src/combined/ffmpeg/ff_mpeg_parser.c diff --git a/src/libffmpeg/ff_mpeg_parser.h b/src/combined/ffmpeg/ff_mpeg_parser.h index 504e746f9..504e746f9 100644 --- a/src/libffmpeg/ff_mpeg_parser.h +++ b/src/combined/ffmpeg/ff_mpeg_parser.h diff --git a/src/libffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 4e5e1ebdf..4e5e1ebdf 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index 8a8a79270..8a8a79270 100644 --- a/src/libffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h index bfe71a6b1..bfe71a6b1 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/ffmpeg_decoder.h diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/combined/ffmpeg/ffmpeg_encoder.c index 7fe65c7fa..7fe65c7fa 100644 --- a/src/libffmpeg/ffmpeg_encoder.c +++ b/src/combined/ffmpeg/ffmpeg_encoder.c |