diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:08:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:08:45 +0200 |
| commit | 3cc8285439ddb6d8b7eb108cdb7dc793a75e1dbd (patch) | |
| tree | cb0482f85a6666b6682ca7f399a5b55e87ef671b /libpostproc/postprocess.c | |
| parent | 4e4708ad8093151b2b79276b7c2950a4462108b4 (diff) | |
| parent | ac1660509ecfbeca7b63eb5ab8360011180e705b (diff) | |
| download | ffmpeg-3cc8285439ddb6d8b7eb108cdb7dc793a75e1dbd.tar.gz | |
Merge commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b' into release/2.4
* commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b':
ape: Support _0000 files with nblock smaller than 64
Conflicts:
libavcodec/apedec.c
See: 699341d647f7af785fb8ceed67604467b0b9ab12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess.c')
0 files changed, 0 insertions, 0 deletions