Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 00:16:16 +0000 (02:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 00:16:16 +0000 (02:16 +0200)
commitda2189596d9a339d2e6eb2f14137de93b15b354f
treea11e6ed2e8f0715fc2d468aa0937ccdf2041fd8a
parent1f20fa2da83922cd73b090b7f336ba51e25b1fb3
parent2df0c32ea12ddfa72ba88309812bfb13b674130f
Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'

* commit '2df0c32ea12ddfa72ba88309812bfb13b674130f':
  lavc: use a separate field for exporting audio encoder padding

Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/avcodec.h
libavcodec/libvorbisenc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
22 files changed:
doc/APIchanges
libavcodec/aacenc.c
libavcodec/ac3enc.c
libavcodec/audio_frame_queue.c
libavcodec/avcodec.h
libavcodec/g722enc.c
libavcodec/libfaac.c
libavcodec/libfdk-aacenc.c
libavcodec/libmp3lame.c
libavcodec/libopencore-amr.c
libavcodec/libopusenc.c
libavcodec/libspeexenc.c
libavcodec/libtwolame.c
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbisenc.c
libavcodec/mpegaudioenc_template.c
libavcodec/nellymoserenc.c
libavcodec/ra144enc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmaenc.c