[FFmpeg-cvslog] Merge commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3'

Michael Niedermayer git at videolan.org
Sat Dec 27 15:16:15 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 27 14:56:10 2014 +0100| [9e893473297ed5c60d40a19eb17a85dca2e63ab3] | committer: Michael Niedermayer

Merge commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3'

* commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3':
  h264: restore a block mistakenly removed in e10fd08a

See: 0ecb3075c1c243cfb656d1cbe0b19cdb91bde659
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e893473297ed5c60d40a19eb17a85dca2e63ab3
---





More information about the ffmpeg-cvslog mailing list