Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'

* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

diff --cc doc/APIchanges
index abca377,fd202aa..caff541
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,41 -13,32 +15,48 @@@ libavutil:     2012-10-2
  
  API changes, most recent first:
  
 -2014-07-xx - xxxxxxx - lavu 53.19.0 - avstring.h
+ 2014-08-xx - xxxxxxx - lavc 55.57.1 - avcodec.h
+   Deprecate unused FF_IDCT_IPP define and ipp avcodec option.
+   Deprecate unused FF_DEBUG_PTS define and pts avcodec option.
+   Deprecate unused FF_CODER_TYPE_DEFLATE define and deflate avcodec option.
+   Deprecate unused FF_DCT_INT define and int avcodec option.
+   Deprecate unused avcodec option scenechange_factor.
+ 
 +2014-07-30 - ba3e331 - lavu 52.94.100 - frame.h
 +  Add av_frame_side_data_name()
 +
 +2014-07-29 - 31e0b5d / 69e7336 - lavu 52.92.100 / 53.19.0 - avstring.h
    Make name matching function from lavf public as av_match_name().
  
 -2014-xx-xx - xxxxxxx - lavc 55.57.0 - avcodec.h
 +2014-07-28 - 2e5c8b0 / c5fca01 - lavc 55.71.100 / 55.57.0 - avcodec.h
    Add AV_CODEC_PROP_REORDER to mark codecs supporting frame reordering.
  
 -2014-07-xx - xxxxxxx - lavu 53.18.0 - display.h
 +2014-07-27 - ff9a154 - lavf 55.50.100 - avformat.h
 +  New field int64_t probesize2 instead of deprecated
 +  field int probesize.
 +
 +2014-07-27 - 932ff70 - lavc 55.70.100 - avdct.h
 +  Add AVDCT / avcodec_dct_alloc() / avcodec_dct_init().
 +
 +2014-07-23 - 8a4c086 - lavf 55.49.100 - avio.h
 +  Add avio_read_to_bprint()
 +
 +2014-07-14 - 62227a7 - lavf 55.47.100 - avformat.h
 +  Add av_stream_get_parser()
 +
 +2014-07-09 - c67690f / a54f03b - lavu 52.92.100 / 53.18.0 - display.h
    Add av_display_matrix_flip() to flip the transformation matrix.
  
 -2014-07-xx - xxxxxxx - lavc 55.56.0 - dv_profile.h
 +2014-07-09 - 1b58f13 / f6ee61f - lavc 55.69.100 / 55.56.0 - dv_profile.h
    Add a public API for DV profile handling.
  
 -2014-06-xx - xxxxxxx - lavu 53.17.0 - imgutils.h
 +2014-06-20 - 0dceefc / 9e500ef - lavu 52.90.100 / 53.17.0 - imgutils.h
    Add av_image_check_sar().
  
 -2014-06-xx - xxxxxxx - lavc 55.55.0 - avcodec.h
 +2014-06-20 - 4a99333 / 874390e - lavc 55.68.100 / 55.55.0 - avcodec.h
    Add av_packet_rescale_ts() to simplify timestamp conversion.
  
 -2014-xx-xx - xxxxxxx - lavf 55.20.0 - avformat.h
 +2014-06-18 - ac293b6 / 194be1f - lavf 55.44.100 / 55.20.0 - avformat.h
    The proper way for providing a hint about the desired timebase to the muxers
    is now setting AVStream.time_base, instead of AVStream.codec.time_base as was
    done previously. The old method is now deprecated.

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/options_table.h
index 7d4984d,61cde0f..37382a5
--- 1/libavcodec/options_table.h
--- 2/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@@ -218,10 -211,11 +220,12 @@@ static const AVOption avcodec_options[
  #if FF_API_ARCH_ALPHA
  {"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"},
  #endif
+ #if FF_API_UNUSED_MEMBERS
  {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"},
+ #endif /* FF_API_UNUSED_MEMBERS */
  {"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
  {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
 +{"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"},
  {"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
  {"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"},
  {"guess_mvs", "iterative motion vector (MV) search (slow)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_GUESS_MVS }, INT_MIN, INT_MAX, V|D, "ec"},

diff --cc libavcodec/version.h
index c341a01,cd35ae6..e794635
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 57
 -#define LIBAVCODEC_VERSION_MICRO  1
 +#define LIBAVCODEC_VERSION_MINOR  71
- #define LIBAVCODEC_VERSION_MICRO 100
++#define LIBAVCODEC_VERSION_MICRO 101
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \