[FFmpeg-cvslog] Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
Michael Niedermayer
git at videolan.org
Fri Apr 11 14:25:25 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 11 14:04:10 2014 +0200| [bad101ab8a54dd36d569daef35f8e583500bbf49] | committer: Michael Niedermayer
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
* commit '89ef08c992c484a46711b1a68a988303679c288e':
DNxHD: K&R formatting cosmetics
Conflicts:
libavcodec/dnxhd_parser.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bad101ab8a54dd36d569daef35f8e583500bbf49
---
More information about the ffmpeg-cvslog
mailing list