merged to r37017 from trunk
authorXiao Xiangquan <xiaoxiangquan@gmail.com>
Mon, 30 May 2011 10:27:45 +0000 (10:27 +0000)
committerXiao Xiangquan <xiaoxiangquan@gmail.com>
Mon, 30 May 2011 10:27:45 +0000 (10:27 +0000)
commit682a5acd03959e5ed8ac4ff7b4b02435df19f50d
tree639de9d0992e147095517fef7b365ac82026680b
parent74f43c20fd601c6acfded12c8f7bcebb8c9d8433
parent221472f7b50914801845ec78cae05d1618bd3c0a
merged to r37017 from trunk
intern/ffmpeg/ffmpeg_compat.h