Merge branch 'master' of git://git.ffmpeg.org/ffmpeg
authorAlexander Strange <astrange@ithinksw.com>
Thu, 10 Mar 2011 07:25:55 +0000 (02:25 -0500)
committerAlexander Strange <astrange@ithinksw.com>
Thu, 10 Mar 2011 07:25:55 +0000 (02:25 -0500)
commite4565c5731bfcd8808d02f47f115e21dc6fc8b35
treef3514d54a6237a1933397775180e52ea30e2c32b
parent4b9ce55576ab27f6a45d542bfda7c1e21fb967f8
parentfb61a7c5343a23d845ab73dd28caf6ec98cd6101
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg

Conflicts:
.gitignore
doc/APIchanges
ffplay.c
libavcodec/arm/asm-offsets.h
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/options.c
libavcodec/pthread.c
libavcodec/thread.h
libavcodec/utils.c
libavcodec/vp3.c
libavcodec/vp8.c
libavformat/utils.c
19 files changed:
libavcodec/arm/asm-offsets.h
libavcodec/avcodec.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/snow.c
libavcodec/utils.c
libavcodec/vp8.c
libavcodec/x86/dsputil_mmx.c
libavutil/internal.h