Merge commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa'

Browse Source

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

Conflicts:
	libavcodec/mlpdec.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-26 20:59:57 +01:00

parent 179cf14832 b9eb03416d

commit fc64e128f0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available