[FFmpeg-cvslog] Merge commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa'
Michael Niedermayer
git at videolan.org
Wed Mar 26 21:05:39 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 20:59:57 2014 +0100| [fc64e128f00893d90014b1c97e6846a14ec53dad] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc64e128f00893d90014b1c97e6846a14ec53dad
---
More information about the ffmpeg-cvslog
mailing list