summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorChristian Schmidt <schmidt@digadd.de>2013-08-30 18:15:44 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-08-31 11:00:46 +0200
commit0d6549d8b57aaa5be8efb794154cdbe9a645910f (patch)
tree39933456a9bf918ecb323b36348f9b49643714cb /libavcodec
parentf1f728cbe4e8516205f0d760a4128c15a39c8baa (diff)
pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
The original idea was to collect PCM codecs that could appear in various MPEG streams in this file. Discussion in IRC lead to the conclusion that one codec per file would be better and stop the need for #ifdefs.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
-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 abf0a38cb5..2eba60fe75 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -426,7 +426,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 7b7afedf6f..9fbd9df75f 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 Libav.
@@ -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"