[FFmpeg-cvslog] Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'

Michael Niedermayer git at videolan.org
Wed Jan 23 18:25:31 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 18:15:29 2013 +0100| [1e7a92f219a8e245128773491346d64c1e6c85fa] | committer: Michael Niedermayer

Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'

* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

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

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





More information about the ffmpeg-cvslog mailing list