falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b' into release/2.4 

* commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
	libavcodec/apedec.c

See: 699341d647
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.10
Michael Niedermayer 10 years ago
parent
4e4708ad80 ac1660509e
commit
3cc8285439
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available