Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 11:41:10 +0000 (12:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 11:41:10 +0000 (12:41 +0100)
commitd16079abf473b51be7686d20f8014bb48a095722
tree1f9ac5e0111d5eaddd886fb9866abf5e30bd59c7
parent57089084ba7ece20889b8196f68ad9b08e8db8ba
parent57b6704ecd0f56d6a3092e448687cfd837bb0ac1
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h