diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 17:58:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 17:58:53 +0100 |
| commit | 47cc6168649485837b1e4fdd5f33f16c275933bd (patch) | |
| tree | 2b79b9d31fc0bb8cece748cb595564bc1eb13cfe /libavcodec/Makefile | |
| parent | c90f31146e8b1407a4a5808d0d904d85baeed5d4 (diff) | |
| parent | 6fd99e78def3c795bdd0bc31f3ae0998d24bc94c (diff) | |
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
png: add a standalone parser
Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h
See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3927a0a0e6..4ce11f16bb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -777,6 +777,7 @@ OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o \ mpegaudiodecheader.o mpegaudiodata.o OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o \ mpeg12.o mpeg12data.o +OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o |