[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 13:12:06 2013 +0100| [72ad824a86233fb0c81a1581a1a7e6468dca6b0f] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  avframe: Copy buffer type in copy_props.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72ad824a86233fb0c81a1581a1a7e6468dca6b0f
---