Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 17:28:59 +0000 (19:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 17:30:55 +0000 (19:30 +0200)
commit96b069450cd037d7e1406859e42f4a1650e31226
tree38bdf389558e660a12597304eafe32ded270a0f5
parent5309e7e6aa1e15e52b197930b7a1a2068eb0ac88
parentee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47
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>
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/dv_tablegen.h
libavcodec/dvdata.c
libavcodec/dvdec.c
libavcodec/dvenc.c