Merge mainline.
authorAlexander Strange <astrange@ithinksw.com>
Tue, 17 May 2011 23:24:24 +0000 (19:24 -0400)
committerAlexander Strange <astrange@ithinksw.com>
Tue, 17 May 2011 23:24:24 +0000 (19:24 -0400)
commitba9b10fcc86ba6fdf71031a7fffaa9fbcf2b821e
treece3a7c5a66a473a73f49253384dcfa7a0cad83fb
parent4f12e1541bdd1495e54cb02635ec83f846942cac
parenta26d2b4bc8af02b27168c277c5097273c05652c2
Merge mainline.

Conflicts:
libavcodec/h264.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264.h
libavcodec/mpegvideo.c
libavcodec/utils.c