Merge commit '95d52464542f532061290192518d5fe1c1930e8d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 08:57:04 +0000 (10:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 08:57:04 +0000 (10:57 +0200)
commitaf5f9c08763baff271401cf7f7478bae4d5db8dc
tree1d62c75c69c64ce230b308073112c7beb4595b97
parent14a61bc3f9ad68151368bc3577bb26fe1146fbf4
parent95d52464542f532061290192518d5fe1c1930e8d
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/libfdk-aacenc.c
libavcodec/options_table.h
libavcodec/version.h