[FFmpeg-cvslog] Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'

Michael Niedermayer git at videolan.org
Tue Feb 4 16:26:55 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  4 16:10:24 2014 +0100| [9a082fec1af547f0e777a55186fdd7887d7dfa0d] | committer: Michael Niedermayer

Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'

* commit 'e46ad30a808744ddf3855567e162292a4eaabac7':
  vp8: use a fixed-size edge emu buffer

Conflicts:
	libavcodec/vp8.c
	libavcodec/vp8.h

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

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





More information about the ffmpeg-cvslog mailing list