Merge commit '95d52464542f532061290192518d5fe1c1930e8d'

* commit '95d52464542f532061290192518d5fe1c1930e8d':
  lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

diff --cc doc/APIchanges
index ffdb8a2,cdfcc09..880687b
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,25 -13,13 +15,27 @@@ libavutil:     2012-10-2
  
  API changes, most recent first:
  
+ 2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h
+   Add MPEG-2 AAC profiles
  
 -2013-06-xx - xxxxxxx - lavu 52.13.0 - mem.h
 +2013-06-xx - xxxxxxx - lavu 52.36.100
 +  Add AVRIPEMD:
 +   av_ripemd_alloc()
 +   av_ripemd_init()
 +   av_ripemd_update()
 +   av_ripemd_final()
 +
 +2013-06-05 - fc962d4 - lavu 52.13.0 - mem.h
    Add av_realloc_array and av_reallocp_array
  
 -2013-05-xx - xxxxxxx - lavfi 3.10.0 - avfilter.h
 +2013-05-30 - 682b227 - lavu 52.35.100
 +  Add AVSHA512:
 +   av_sha512_alloc()
 +   av_sha512_init()
 +   av_sha512_update()
 +   av_sha512_final()
 +
 +2013-05-24 - xxxxxxx - lavfi 3.70.100 - avfilter.h
    Add support for slice multithreading to lavfi. Filters supporting threading
    are marked with AVFILTER_FLAG_SLICE_THREADS.
    New fields AVFilterContext.thread_type, AVFilterGraph.thread_type and

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/libfdk-aacenc.c
Simple merge

diff --cc libavcodec/options_table.h
Simple merge

diff --cc libavcodec/version.h
index c1941ab,7c82519..b59cdd2
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -26,11 -26,9 +26,11 @@@
   * Libavcodec version macros.
   */
  
 +#include "libavutil/avutil.h"
 +
  #define LIBAVCODEC_VERSION_MAJOR 55
- #define LIBAVCODEC_VERSION_MINOR  16
 -#define LIBAVCODEC_VERSION_MINOR 10
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  17
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \