Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'

Browse Source

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

Conflicts:
	libavcodec/apedec.c

See: 699341d647
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2015-05-10 21:42:08 +02:00

parent 004564c930 295e05a762

commit 918c5ea4d3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available