Michael Niedermayer c4e8821732 Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e' ...

* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h

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

2013-03-08 20:33:26 +01:00

6.4 KiB

Raw Blame History

View Raw