diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:01:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:01:03 +0200 |
commit | 7565aaecb4978cb5903335ffdea5dae21a924494 (patch) | |
tree | 7bd065b99570f45527606c38208c9161bfc6e4ab /libavformat/Makefile | |
parent | 89efaabc9949dcdc49126881beaa38355b8f9a44 (diff) | |
parent | fcc455ff2e11ed04603aead1984a92ac3a4be226 (diff) | |
download | ffmpeg-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