diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 21:41:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 21:42:08 +0200 |
| commit | 918c5ea4d3702a9eebf4794e75507c4d5bc9cba2 (patch) | |
| tree | 9f918bbecd27065dc63da9634c7ae122e4e98556 /libavcodec/pcm-dvd.c | |
| parent | 004564c930ef60d2f9e8798e820ed7b2a37ba0bd (diff) | |
| parent | 295e05a762332c5edcc84c325e94457815a51b5c (diff) | |
| download | ffmpeg-918c5ea4d3702a9eebf4794e75507c4d5bc9cba2.tar.gz | |
Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'
* commit '295e05a762332c5edcc84c325e94457815a51b5c':
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 'libavcodec/pcm-dvd.c')
0 files changed, 0 insertions, 0 deletions