Michael Niedermayer da2189596d 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>

2014-10-14 02:16:16 +02:00

7.8 KiB

Raw Blame History

View Raw