Merge commit '67bb3a4e'

* commit '67bb3a4e': arm: cosmetics: Reindent the h264dsp neon init function Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '67bb3a4e'
* commit '67bb3a4e': arm: cosmetics: Reindent the h264dsp neon init function Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
9ef7c0c5 · Michael Niedermayer · 1c010fd0 · 67bb3a4e · 9ef7c0c5
Commit 9ef7c0c5 authored Jan 08, 2014 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 21 additions and 21 deletions

h264dsp_init_arm.c libavcodec/arm/h264dsp_init_arm.c +21 -21

No files found.
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c