diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 10:08:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 10:08:50 +0200 |
| commit | 60657ee37afb5388b75430db95cbce5146731c63 (patch) | |
| tree | 0d802ab312d22ed5bc1f42fd3bcaa4bf4e027f28 /libavcodec/sunrast.c | |
| parent | 90c8863a749432608b05d2b7d93475e8ebd62bbb (diff) | |
| parent | e7a44f87d07655ec0cd31c315936931674434340 (diff) | |
| download | ffmpeg-60657ee37afb5388b75430db95cbce5146731c63.tar.gz | |
Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'
* commit 'e7a44f87d07655ec0cd31c315936931674434340':
4xm: refactor fourxm_read_header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sunrast.c')
0 files changed, 0 insertions, 0 deletions