Merge mainline. master
authorAlexander Strange <astrange@ithinksw.com>
Sun, 12 Jun 2011 22:07:20 +0000 (15:07 -0700)
committerAlexander Strange <astrange@ithinksw.com>
Sun, 12 Jun 2011 22:07:20 +0000 (15:07 -0700)
commite1f517aa7ac7244d011cffac578fff05ca5fcb45
tree361ebc896a12c3a220798ab18015713af2768acb
parent9cec36a6845c17e90a8d0c2cf9b03a00987c31f0
parentde859358830cfd1daffb1773f6bb069659027321
Merge mainline.

Very few differences should remain.

Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pthread.c
libavcodec/utils.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/utils.c
libavutil/internal.h