diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-31 13:35:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-31 13:36:01 +0200 |
| commit | 4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e (patch) | |
| tree | af9d4752bcb07b955c0f9ffce6e3d9782ab57c98 /libavcodec/Makefile | |
| parent | 227a0eb5a92409572f2cecde6137529b83e7d495 (diff) | |
| parent | 0d6549d8b57aaa5be8efb794154cdbe9a645910f (diff) | |
| download | android_external_ffmpeg-4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e.tar.gz android_external_ffmpeg-4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e.tar.bz2 android_external_ffmpeg-4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e.zip | |
Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'
* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
pcm_bluray: rename pcm-mpeg.c to pcm-bluray.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 dbadd0a624..63c2631cde 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -521,7 +521,7 @@ OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o # (AD)PCM decoders/encoders OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-mpeg.o +OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-bluray.o OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o |