diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 13:05:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 14:49:28 +0200 |
| commit | 835bc39b2608c4e8167e06b1c8606acfa09af409 (patch) | |
| tree | dd81e474ae519e83fbb3cea187910b35a1b4544c /libavformat/rtpenc_jpeg.c | |
| parent | 2a7bdbf67efbb7061957f52ef81f49e6c06cfd54 (diff) | |
| parent | bb81b2b2e06abbf713094f8b77b4cbd550c02503 (diff) | |
| download | ffmpeg-835bc39b2608c4e8167e06b1c8606acfa09af409.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
Fix top-level description
update Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
0 files changed, 0 insertions, 0 deletions