ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Jun 9
17:43:24 2015 +0200| [551813a963b2c04d0211a6c87ecd400bdcf2c5f7] | committer:
Michael Niedermayer
Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
* commit '210921722bf828b3b895ebcbc34374e6c4452c6f':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=551813a963b2c04d0211a6c87ecd400bdcf2c5f7
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
