Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 12:04:10 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 12:04:10 +0000 (14:04 +0200)
commitbad101ab8a54dd36d569daef35f8e583500bbf49
treea8d7ac676897e6b29f857bd91bc8f7416938bb56
parentd9fef740bd6a5aa2a3ce1a612348a05c4c5ca6e9
parent89ef08c992c484a46711b1a68a988303679c288e
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>
libavcodec/dnxhd_parser.c
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c