Commit fc64e128 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b9eb0341'

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

Conflicts:
	libavcodec/mlpdec.c

See: b01a2562Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 179cf148 b9eb0341
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