ffmpeg | branch: release/2.4 | Michael Niedermayer <mich...@niedermayer.cc> |
Thu Aug 20 14:10:08 2015 +0200| [7da1e8a0d89159912ff1b1ac0525e5e8719f2c52] |
committer: Michael Niedermayer
Merge commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5' into release/2.4
* commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7da1e8a0d89159912ff1b1ac0525e5e8719f2c52
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
