diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 20:59:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 21:00:27 +0100 |
| commit | fc64e128f00893d90014b1c97e6846a14ec53dad (patch) | |
| tree | 30228f08ceddfb142ae941f792d3de12564aa1bf /libavformat/ffm.h | |
| parent | 179cf1483262c1adf9d70e71df3078c26fcc6f13 (diff) | |
| parent | b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa (diff) | |
| download | ffmpeg-fc64e128f00893d90014b1c97e6846a14ec53dad.tar.gz | |
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>
Diffstat (limited to 'libavformat/ffm.h')
0 files changed, 0 insertions, 0 deletions