ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Jun 3
19:03:08 2015 +0200| [6034b4bb88c1e5fc47fe2c2ff81835cb3dd4e872] | committer:
Michael Niedermayer
Merge commit '7f596368a404363d72b1be6d16c51420a71bc523'
* commit '7f596368a404363d72b1be6d16c51420a71bc523':
bink: Factorize bink put_pixel
Conflicts:
libavcodec/bink.c
See: b3675f890abee0bc446495711223a5c790234672
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6034b4bb88c1e5fc47fe2c2ff81835cb3dd4e872
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
