Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: libavformat/Makefile

Issue 9317107: FFmpeg merge diff after patches. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« libavcodec/Makefile ('K') | « libavcodec/allcodecs.c ('k') | libavformat/matroskadec.c » ('j') | libavformat/matroskadec.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libavformat/Makefile
diff --git a/libavformat/Makefile b/libavformat/Makefile
index bd2b17b6cd2a3509367c0d157fd3bebcf2d22b29..6bae9a74ab5894ccba1a4420a93f67dfb28d4a99 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -184,13 +184,13 @@ OBJS-$(CONFIG_NULL_MUXER) += nullenc.o
OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o
OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o
OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o
+OBJS-$(CONFIG_FLAC_DECODER) += oggparseflac.o
+OBJS-$(CONFIG_DIRAC_DEMUXER) += oggparsedirac.o
+OBJS-$(CONFIG_LIBSPEEX) += oggparsespeex.o
scherkus (not reviewing) 2012/02/06 17:46:29 is this our patch?
DaleCurtis 2012/02/06 18:59:01 Yup, 05_respect_flac_dirac_configure.patch
OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
oggparsecelt.o \
- oggparsedirac.o \
- oggparseflac.o \
oggparseogm.o \
oggparseskeleton.o \
- oggparsespeex.o \
oggparsetheora.o \
oggparsevorbis.o \
vorbiscomment.o
« libavcodec/Makefile ('K') | « libavcodec/allcodecs.c ('k') | libavformat/matroskadec.c » ('j') | libavformat/matroskadec.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698