diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 00:03:35 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 00:09:17 +0400 |
commit | f392949f1ac799ad1d7c1cda66e41c1670022d5a (patch) | |
tree | e3b97d59c99dfc21cf92abb7b71305f4e59f408a /libavcodec/Makefile | |
parent | 68014c6ed98b5c90f4dc211429dd269ac727be4b (diff) | |
parent | ae17878fb2ab100264226c84c58f5b95a703312f (diff) |
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others
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 f84203953a..70a6e25e9a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -151,7 +151,7 @@ OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmv.o OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmv.o -OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brender_pix.o +OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brenderpix.o OBJS-$(CONFIG_C93_DECODER) += c93.o OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \ cavsdata.o mpeg12data.o |