Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 22:25:21 +0000 (00:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 22:25:21 +0000 (00:25 +0200)
commitd063bb63cb389648d149bd1d9a886e12ed2e4d47
tree3e656fce9989c617a2337eb55c040337045b28a8
parent909757fabdf8d7f9360a06a81625a58a5ec3e05c
parentd2264740e6345a4bcfaeac529a66715bdd5f8fbe
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  VP3: K&R formatting cosmetics

Conflicts:
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp3.c
libavcodec/vp3_parser.c
libavcodec/vp3data.h
libavcodec/vp3dsp.c