diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 00:25:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 00:25:21 +0200 |
| commit | d063bb63cb389648d149bd1d9a886e12ed2e4d47 (patch) | |
| tree | 3e656fce9989c617a2337eb55c040337045b28a8 /libavformat/mp3enc.c | |
| parent | 909757fabdf8d7f9360a06a81625a58a5ec3e05c (diff) | |
| parent | d2264740e6345a4bcfaeac529a66715bdd5f8fbe (diff) | |
| download | ffmpeg-d063bb63cb389648d149bd1d9a886e12ed2e4d47.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
VP3: K&R formatting cosmetics
Conflicts:
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mp3enc.c')
0 files changed, 0 insertions, 0 deletions