aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_aformat.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-09 19:28:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-09 19:30:55 +0200
commit96b069450cd037d7e1406859e42f4a1650e31226 (patch)
tree38bdf389558e660a12597304eafe32ded270a0f5 /libavfilter/af_aformat.c
parent5309e7e6aa1e15e52b197930b7a1a2068eb0ac88 (diff)
parentee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47 (diff)
downloadffmpeg-96b069450cd037d7e1406859e42f4a1650e31226.tar.gz
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>
Diffstat (limited to 'libavfilter/af_aformat.c')
0 files changed, 0 insertions, 0 deletions