diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:42:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:42:22 +0100 |
| commit | b5b36e45b3282818b8374c8385a9c353a6ac3ff4 (patch) | |
| tree | 6832f9f8e680a04412332decada0180d92bd9c08 /libswresample | |
| parent | f038623d534212c79f31434b0b071039c296a08c (diff) | |
| parent | 4edbb0955e043d698dcc1b5073b6e714f9cc7960 (diff) | |
| download | ffmpeg-b5b36e45b3282818b8374c8385a9c353a6ac3ff4.tar.gz | |
Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4
* commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions