Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:41:41 +0000 (16:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:41:41 +0000 (16:41 +0200)
commitcac07d0e103656a2436ea04b700128ce436a4d06
tree26ad63f72adfeb90f1f5857cb5c458cdd2d77ff1
parentb7dd250b7545ece973bd4c92fd7f93ce042fa911
parent5fccedaa67390ccddd6347c8e1c71b7664558bcd
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/version.h