diff options
author | James Almer <jamrial@gmail.com> | 2017-10-30 20:58:03 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-30 20:58:03 -0300 |
commit | 7131139b4370bd2c434564db36f872e8f92d74e7 (patch) | |
tree | 30f45da66052924292afea3e60fe3fdbfdd712c8 /libavcodec/ra144.c | |
parent | 0e5a47693c4b2e77b3951c209e842b8a72b7b36b (diff) | |
parent | 6ccf76aec73b2cd598bb1e65d126d8a12540c411 (diff) | |
download | ffmpeg-7131139b4370bd2c434564db36f872e8f92d74e7.tar.gz |
Merge commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411'
* commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411':
mpjpeg: Use proper CR/LF in multipart headers
This commit is a noop, see 0d2f4eedc8a46892471c51cbc7a78cd9a489771a
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/ra144.c')
0 files changed, 0 insertions, 0 deletions