diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-25 01:19:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-25 01:19:40 +0200 |
| commit | 14d5e214bfb56f08b1d34d13758c1e56a59c8c99 (patch) | |
| tree | 32ebdb64e86373a84a8fedc29ab535c452011a57 /libswscale/utils.c | |
| parent | 88084eecdfd163802a47501935408acbe07b1691 (diff) | |
| parent | 8c0fa61a9713a1306fca7997dd04d72ea1f060ea (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
jpegdec: actually search for and parse RSTn
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions