[FFmpeg-cvslog] Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'
Michael Niedermayer
git at videolan.org
Sun May 10 21:59:34 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 10 21:41:31 2015 +0200| [918c5ea4d3702a9eebf4794e75507c4d5bc9cba2] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=918c5ea4d3702a9eebf4794e75507c4d5bc9cba2
---
More information about the ffmpeg-cvslog
mailing list