diff options
| author | Michael Niedermayer <[email protected]> | 2011-12-25 19:25:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-12-25 19:25:27 +0100 |
| commit | 8413f12e1b234e633389c75c403d9aa712c9ef47 (patch) | |
| tree | 45759720297eb50f0e8b0057c1b3217761eb2237 /libavcodec/rtjpeg.c | |
| parent | df825c956af76ae04af18dc00403bf1a0e745af1 (diff) | |
| parent | d61b38b9db9bdc5e98f529c043767f8fd5369859 (diff) | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
Update Changelog for 0.7.3 release
Conflicts:
Changelog
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/rtjpeg.c')
0 files changed, 0 insertions, 0 deletions