aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 18:01:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 18:01:03 +0200
commit7565aaecb4978cb5903335ffdea5dae21a924494 (patch)
tree7bd065b99570f45527606c38208c9161bfc6e4ab /libavformat/Makefile
parent89efaabc9949dcdc49126881beaa38355b8f9a44 (diff)
parentfcc455ff2e11ed04603aead1984a92ac3a4be226 (diff)
downloadffmpeg-7565aaecb4978cb5903335ffdea5dae21a924494.tar.gz
Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'
* commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226': avformat/dv: K&R formatting cosmetics Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
0 files changed, 0 insertions, 0 deletions