diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 12:00:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 12:00:45 +0100 |
| commit | b5bdd04f0818568a3ab663f6aca36df3c7b2b537 (patch) | |
| tree | bc6fa06368ae832ebeebcf5dd3ba5deefb2e590a /libavcodec/mpc7.c | |
| parent | 0c402810faf64ea3b62601e94d3dcb0cbbdcee5e (diff) | |
| parent | afdf94689c4e462bcf886f6ad68eac736eb1b95a (diff) | |
| download | ffmpeg-b5bdd04f0818568a3ab663f6aca36df3c7b2b537.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: K&R formatting cosmetics
Conflicts:
libavformat/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc7.c')
0 files changed, 0 insertions, 0 deletions