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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: libavcodec/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
« configure ('K') | « configure ('k') | libavcodec/allcodecs.c » ('j') | libavformat/Makefile » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libavcodec/Makefile
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2173855e5b0592fff4fb5b42b711871426f199f6..3500f682a899c2ddadc4c2ab67962998b8c0aff7 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -601,8 +601,7 @@ OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o
OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_MXF_MUXER) += timecode.o
OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o
-OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \
- dirac.o mpeg12data.o vorbis_data.o
+OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o vorbis_data.o
scherkus (not reviewing) 2012/02/06 17:46:29 is this our patch?
DaleCurtis 2012/02/06 18:59:01 Yup, 05_respect_flag_dirac_configure.patch
OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o \
vorbis_data.o
OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o mpegvideo.o xiph.o
« configure ('K') | « configure ('k') | libavcodec/allcodecs.c » ('j') | libavformat/Makefile » ('J')

Powered by Google App Engine
This is Rietveld 408576698