[FFmpeg-soc] [PATCH 2/3] Merge changes from trunk

[Alex Converse]

---
 checkout.sh |    2 +-
 ffmpeg.diff |   36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Merge-changes-from-trunk.patch
Type: text/x-patch
Size: 4504 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-soc/attachments/20091114/915fbd3e/attachment.bin>