diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-08 23:53:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-08 23:53:08 +0200 |
| commit | 2a33dc2cdf6d62204f6f5c425c185d714403daa6 (patch) | |
| tree | aa3ccf65c4f4accd6630d97c2b092bf332f02ab8 /tests/ref/fate/dds-dx10-bc4 | |
| parent | 91748662bc024294d50e2e0542d727265e331105 (diff) | |
| parent | d09b4cce21cdad5ef2855698395ffd6e37445212 (diff) | |
| download | ffmpeg-2a33dc2cdf6d62204f6f5c425c185d714403daa6.tar.gz | |
Merge commit 'd09b4cce21cdad5ef2855698395ffd6e37445212'
* commit 'd09b4cce21cdad5ef2855698395ffd6e37445212':
mpjpeg: Simplify using avio_printf
Conflicts:
libavformat/mpjpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/dds-dx10-bc4')
0 files changed, 0 insertions, 0 deletions