diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-22 22:02:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-22 22:02:48 +0200 |
| commit | 016cca45047483f508c05aa10d9448f6fcb6de0a (patch) | |
| tree | 0fb2be1ebaa66f80227fcf78d2346f30268ca6aa /libavcodec/mjpeg_parser.c | |
| parent | bc15b5238f9984458b5cceb99670e9db53fc74f1 (diff) | |
| parent | 7bdd2ff6825951f7a6a6008303acfce7c2a63532 (diff) | |
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
http: Use a constant for the supported header size
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/mjpeg_parser.c')
0 files changed, 0 insertions, 0 deletions