Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
	doc/APIchanges

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

diff --cc doc/APIchanges
index a35501a,10366b0..21c7d92
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,31 -13,19 +15,35 @@@ libavutil:     2012-10-2
  
  API changes, most recent first:
  
 -2014-04-xx - xxxxxxx - lavc 55.50.0 - dxva2.h
+ 2014-04-xx - xxxxxxx - avcodec.h
+   Deprecate CODEC_FLAG_INPUT_PRESERVED. Its functionality is replaced by passing
+   reference-counted frames to encoders.
+ 
 +2014-04-29 - 1bf6396 - lavc 55.60.100 - avcodec.h
 +  Add AVCodecDescriptor.mime_types field.
 +
 +2014-04-29 - xxxxxxx - lavu 52.80.0 - hash.h
 +  Add av_hash_final_bin(), av_hash_final_hex() and av_hash_final_b64().
 +
 +2014-03-07 - 8b2a130 - lavc 55.50.0 / 55.53.100 - dxva2.h
    Add FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO for old Intel GPUs.
  
 -2014-04-xx - xxxxxxx - lavu 53.13.0 - avutil.h
 +2014-04-xx - xxxxxxx - lavu 53.13.0 / 52.78.100 - avutil.h
    Add av_get_time_base_q().
  
 -2014-04-xx - xxxxxxx - lavu 53.12.0 - crc.h
 +2014-04-xx - xxxxxxx - lavu 53.12.0 / 52.77.100 - crc.h
    Add AV_CRC_16_ANSI_LE crc variant.
  
 +2014-04-XX - xxxxxxx - lavf xx.xx.1xx - avformat.h
 +  Add av_format_inject_global_side_data()
 +
 +2014-04-12 - xxxxxxx - lavu 52.76.100 - log.h
 +  Add av_log_get_flags()
 +
 +2014-04-xx - xxxxxxx - lavd 55.12.100 - avdevice.h
 +  Add avdevice_capabilities_create() function.
 +  Add avdevice_capabilities_free() function.
 +
  2014-04-xx - xxxxxxx - lavu 53.11.0 - pixfmt.h
    Add AV_PIX_FMT_YVYU422 pixel format.
  

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/mpegvideo_enc.c
Simple merge

diff --cc libavcodec/options_table.h
Simple merge

diff --cc libavcodec/version.h
Simple merge