diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 13:36:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 13:37:25 +0200 |
| commit | 56d3cd1455ea1970165a3ca047a97c3e43a9e9aa (patch) | |
| tree | e0f59d1505d58a5d007cfb93f78257a0525d84d1 /libavformat/Makefile | |
| parent | 47a721348a5feae818127b821b6cfc47074938d7 (diff) | |
| parent | e4dc1000d7bbbcb5b45cf9849fc5315f19578e37 (diff) | |
Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37':
yuv4mpeg: split the demuxer and muxer into separate files
Conflicts:
libavformat/yuv4mpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 00358e771b..b9ef19e39e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -431,8 +431,8 @@ OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o OBJS-$(CONFIG_YOP_DEMUXER) += yop.o -OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o -OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o +OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o +OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpegdec.o # external libraries OBJS-$(CONFIG_LIBGME_DEMUXER) += libgme.o |