diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 12:03:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 12:03:59 +0100 |
| commit | 6baaaa0174bf2eb58016c3ac6b02fe2e5a8b1089 (patch) | |
| tree | c6c5c55e65fafcdba6971975ff9e4f84323a9cd2 /tests/ref/acodec/pcm-f64le | |
| parent | 9e3e11a348e047da05415c3e7ea6720be2d78d9f (diff) | |
| parent | 5af78cc98d807f3b43510410dad46e1840c5c99f (diff) | |
| download | ffmpeg-6baaaa0174bf2eb58016c3ac6b02fe2e5a8b1089.tar.gz | |
Merge commit '5af78cc98d807f3b43510410dad46e1840c5c99f' into release/1.1
* commit '5af78cc98d807f3b43510410dad46e1840c5c99f':
mlp: store the channel layout for each substream.
mlpdec: TrueHD: use Libav channel order.
mlpdec: set the channel layout.
x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/pcm-f64le')
0 files changed, 0 insertions, 0 deletions