diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 23:16:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 23:16:50 +0100 |
| commit | 70cbb473608b0746d0ca4a5614b038d8f722d476 (patch) | |
| tree | e9741a866e820b7758d4f495be1a911544555dee /libavcodec/wavpack.h | |
| parent | 287eb69973f8066a68e924bdf9433b2faad01dfa (diff) | |
| parent | 60b055133485891405722bc9722e2c74fc9764b8 (diff) | |
| download | ffmpeg-70cbb473608b0746d0ca4a5614b038d8f722d476.tar.gz | |
Merge commit '60b055133485891405722bc9722e2c74fc9764b8'
* commit '60b055133485891405722bc9722e2c74fc9764b8':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.h')
0 files changed, 0 insertions, 0 deletions