aboutsummaryrefslogtreecommitdiffstats
path: root/RELEASE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-11 14:04:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-11 14:04:10 +0200
commitbad101ab8a54dd36d569daef35f8e583500bbf49 (patch)
treea8d7ac676897e6b29f857bd91bc8f7416938bb56 /RELEASE
parentd9fef740bd6a5aa2a3ce1a612348a05c4c5ca6e9 (diff)
parent89ef08c992c484a46711b1a68a988303679c288e (diff)
downloadffmpeg-bad101ab8a54dd36d569daef35f8e583500bbf49.tar.gz
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@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions