Merge branch 'master' into race_checking
authorAlexander Strange <astrange@ithinksw.com>
Sat, 23 Oct 2010 22:46:15 +0000 (18:46 -0400)
committerAlexander Strange <astrange@ithinksw.com>
Sat, 23 Oct 2010 22:46:15 +0000 (18:46 -0400)
commitac91a9669302eb445c402fd54ad0fa6de476ec79
tree31b008f6c234bc43662247c8102ad14c3781485c
parent5ea0d33e34d2f256fac0c2b38e2a4478c22a1358
parent18893e1423c3d8a65ca753806638ac160fefe342
Merge branch 'master' into race_checking
libavcodec/h264.c
libavcodec/h264.h