1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
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
..
2014-12-01 00:31:06 +01:00
2014-12-01 00:31:06 +01:00
2014-10-22 23:12:38 +02:00
2014-12-01 00:31:06 +01:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2014-12-06 02:48:17 +01:00