Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 01:51:35 +0000 (02:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 01:51:35 +0000 (02:51 +0100)
commit7e90053822f43e5dfc55d6cdac02f993068f4533
tree43ce8bd9cd7f85a366b6d86be0135605c6090d9f
parent1667152a9c1af2ca978f005bb095e479ef7a3107
parent45635885e44cb7adce35ac19279d48c1ef6c4779
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: increase edge_emu_buffer size for VC1
  lavc: merge latest x86inc.asm fixes with x264

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavutil/x86/x86inc.asm