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

Side by Side Diff: patches/ugly/13_remove_avcore.patch

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile 1 diff -wurp -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
2 --- orig/libavcodec/Makefile» 2010-10-11 16:55:45 -0700 2 --- orig/libavcodec/Makefile» 2010-11-04 08:09:37 -0700
3 +++ ffmpeg-mt/libavcodec/Makefile» 2010-10-11 16:55:47 -0700 3 +++ ffmpeg-mt/libavcodec/Makefile» 2010-11-04 08:09:42 -0700
4 @@ -1,7 +1,9 @@ 4 @@ -1,7 +1,9 @@
5 include $(SUBDIR)../config.mak 5 include $(SUBDIR)../config.mak
6 6
7 NAME = avcodec 7 NAME = avcodec
8 -FFLIBS = avutil avcore 8 -FFLIBS = avutil avcore
9 +FFLIBS = avutil 9 +FFLIBS = avutil
10 +# removing avcore dependency to avoid adding dll to installer/loader. 10 +# removing avcore dependency to avoid adding dll to installer/loader.
11 +#FFLIBS = avutil avcore 11 +#FFLIBS = avutil avcore
12 12
13 HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h 13 HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h
14 14
15 @@ -22,6 +24,8 @@ OBJS = allcodecs.o 15 @@ -22,6 +24,8 @@ OBJS = allcodecs.o
16 resample2.o \ 16 resample2.o \
17 simple_idct.o \ 17 simple_idct.o \
18 utils.o \ 18 utils.o \
19 + ../libavcore/imgutils.o \ 19 + ../libavcore/imgutils.o \
20 + ../libavcore/parseutils.o 20 + ../libavcore/parseutils.o
21 21
22 # parts needed for many different codecs 22 # parts needed for many different codecs
23 OBJS-$(CONFIG_AANDCT) += aandcttab.o 23 OBJS-$(CONFIG_AANDCT) += aandcttab.o
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698