Michael Niedermayer d16079abf4 Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1' ...

* commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1':
  avcodec: add AVCodecContext.sw_pix_fmt

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

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

2014-12-27 12:41:10 +01:00

86 KiB

Raw Blame History

View Raw