Michael Niedermayer 4c73123333 Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67' ...

* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
  asv: K&R formatting cosmetics

Conflicts:
	libavcodec/asvdec.c
	libavcodec/asvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-09-02 21:57:46 +02:00

3.5 KiB

Raw Blame History

View Raw