diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:10:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:11:32 +0200 |
| commit | 17498b70d8b733804723b63a9f80c35f206daadf (patch) | |
| tree | f773db6313868ca876996f377990e4fbaccdff39 /tests/ref/vsynth/vsynth2-mpeg4-qpel | |
| parent | 2a33dc2cdf6d62204f6f5c425c185d714403daa6 (diff) | |
| parent | 161a301d44274645c2272855dac3e4664f935603 (diff) | |
| download | ffmpeg-17498b70d8b733804723b63a9f80c35f206daadf.tar.gz | |
Merge commit '161a301d44274645c2272855dac3e4664f935603'
* commit '161a301d44274645c2272855dac3e4664f935603':
mpjpeg: Write the Content-length
Conflicts:
libavformat/mpjpeg.c
See: 0d2f4eedc8a46892471c51cbc7a78cd9a489771a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth2-mpeg4-qpel')
0 files changed, 0 insertions, 0 deletions