Merge commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:59:57 +0000 (20:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 20:00:27 +0000 (21:00 +0100)
commitfc64e128f00893d90014b1c97e6846a14ec53dad
tree30228f08ceddfb142ae941f792d3de12564aa1bf
parent179cf1483262c1adf9d70e71df3078c26fcc6f13
parentb9eb03416d93a5c4ece27ffef5e6e11c81bec6fa
Merge commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa'

* commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa':
  truehd: break out part of output_data into platform-specific callback.

Conflicts:
libavcodec/mlpdec.c

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