diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-30 05:20:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-30 05:20:58 +0100 |
| commit | e1492151fb0c1ad2a9efbb2f2413b60113208b61 (patch) | |
| tree | e4852fd092e2b2346c21e87d8b69987b2b4c2a68 /libavcodec/Makefile | |
| parent | 90bf7c7b41c9e78663ef3da00480f70854072932 (diff) | |
| parent | 20a7d3178f2370ebd1f548c144bc90d1e1bcd81a (diff) | |
| download | ffmpeg-streaming-e1492151fb0c1ad2a9efbb2f2413b60113208b61.zip ffmpeg-streaming-e1492151fb0c1ad2a9efbb2f2413b60113208b61.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
png: add missing #if HAVE_SSSE3 around function pointer assignment.
imdct36: mark SSE functions as using all 16 XMM registers.
png: move DSP functions to their own DSP context.
sunrast: Add a sample request for TIFF, IFF, and Experimental Rastfile formats.
sunrast: Cosmetics
sunrast: Remove if (unsigned int < 0) check.
sunrast: Replace magic number by a macro.
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/pngdec.c
libavcodec/sunrast.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8fd057d..b8128ef 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -322,7 +322,7 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o -OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o +OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o |
