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 | |
| parent | 227a0eb5a92409572f2cecde6137529b83e7d495 (diff) | |
| parent | 0d6549d8b57aaa5be8efb794154cdbe9a645910f (diff) | |
| download | ffmpeg-4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e.tar.gz | |
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')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/pcm-bluray.c (renamed from libavcodec/pcm-mpeg.c) | 4 |
2 files changed, 3 insertions, 3 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 diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-bluray.c index 0061bc9315..804b7b1181 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-bluray.c @@ -1,5 +1,5 @@ /* - * LPCM codecs for PCM formats found in MPEG streams + * LPCM codecs for PCM format found in Blu-ray PCM streams * Copyright (c) 2009, 2013 Christian Schmidt * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file - * PCM codecs for encodings found in MPEG streams (DVD/Blu-ray) + * PCM codec for Blu-ray PCM audio tracks */ #include "libavutil/channel_layout.h" |