Michael Niedermayer 96b069450c Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47' ...

* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
  dv: K&R formatting cosmetics

Conflicts:
	libavcodec/dv.c
	libavcodec/dv.h
	libavcodec/dv_profile.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c

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

2014-09-09 19:30:55 +02:00

3.3 KiB

Raw Blame History

View Raw