Changeset 179cf148 in ffmpeg

Timestamp:

Mar 26, 2014, 7:58:03 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fc64e128

Parents:

b01a2562 (diff), fcf5fc44 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'

• commit 'fcf5fc444522d24caa9907225802817ae788f511': truehd: tune VLC decoding for ARM.

Conflicts:

libavcodec/mlpdec.c

See: e555e1bc39ea71d46a07d0bb847fb426c2dd4d80
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)