[FFmpeg-cvslog] Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 20:41:41 2013 +0100| [307dc32a1a7152ebacdcf9a0e58226f786ac639a] | committer: Michael Niedermayer

Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'

* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
  AVFrame: add side data.

Conflicts:
	libavutil/frame.h

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

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