diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:00:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:00:08 +0200 |
| commit | cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca (patch) | |
| tree | eab53df81a61f27ee2474366d01cb88233557ba0 /libavcodec/Makefile | |
| parent | d7f917c37af24eec2720231db03ab41469550855 (diff) | |
| parent | a42e3a6700547e4e49445bda81d3a89ec3e081a9 (diff) | |
| download | android_external_ffmpeg-cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca.tar.gz android_external_ffmpeg-cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca.tar.bz2 android_external_ffmpeg-cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca.zip | |
Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
pcm_dvd: consolidate pieces from pcm.c and mpeg.c
Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.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 63c2631cde..f5ce4e14c6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -522,7 +522,7 @@ OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-bluray.o -OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm-dvd.o OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_F32LE_DECODER) += pcm.o |