Commit 4273236e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0d6549d8'

* commit '0d6549d8':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 227a0eb5 0d6549d8
...@@ -521,7 +521,7 @@ OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o ...@@ -521,7 +521,7 @@ OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o
# (AD)PCM decoders/encoders # (AD)PCM decoders/encoders
OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o
OBJS-$(CONFIG_PCM_ALAW_ENCODER) += 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_DVD_DECODER) += pcm.o
OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o
OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o
......
/* /*
* 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 * Copyright (c) 2009, 2013 Christian Schmidt
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/** /**
* @file * @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" #include "libavutil/channel_layout.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment