diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:32:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:32:52 +0200 |
| commit | 251f9dcf225b2aac2181da3d7e05413483e1be74 (patch) | |
| tree | 34271fc1c5d1ce1f88190d05c38ba6d073e1bade /libavformat/img2.c | |
| parent | d423fc12e6e11f5d7792f8fd916fb10133862360 (diff) | |
| parent | bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f (diff) | |
| download | ffmpeg-251f9dcf225b2aac2181da3d7e05413483e1be74.tar.gz | |
Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'
* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
quickdraw: Switch to greedy parsing
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
0 files changed, 0 insertions, 0 deletions