diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 09:35:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 09:35:33 +0200 |
| commit | c475a58dd60cd5317f8a63c80772f4bb893a1eba (patch) | |
| tree | 92bbb1843de558301105d1ddfcc99c971f53981b /libavformat/rtpdec.c | |
| parent | 500220a8e84acb952e8a62d88505c5fb6a51843a (diff) | |
| parent | ee9a4dff4ad76f989c3b5925f76770996506faf4 (diff) | |
| download | ffmpeg-c475a58dd60cd5317f8a63c80772f4bb893a1eba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mmf: K&R formatting cosmetics
Conflicts:
libavformat/mmf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
0 files changed, 0 insertions, 0 deletions