diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:37:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:37:01 +0200 |
| commit | 6b1b63df85ffa020bb36ac8d444a83b755a1d86d (patch) | |
| tree | 232b69289597b1021be4547208b9e3e48ad6b45b /libavcodec/mjpeg2jpeg_bsf.c | |
| parent | 5dee3e8bb45d5f80f23a588a27e5d99caaa8f021 (diff) | |
| parent | 71549a857b13edf4c4f95037de6ed5bb4c4bd4af (diff) | |
| download | ffmpeg-6b1b63df85ffa020bb36ac8d444a83b755a1d86d.tar.gz | |
Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
http: Support auth method detection for POST
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
0 files changed, 0 insertions, 0 deletions