Michael Niedermayer 307dc32a1a Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c' ...

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

Conflicts:
	libavutil/frame.h

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

2013-03-08 20:41:41 +01:00

14 KiB

Raw Blame History

View Raw