diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 02:16:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 02:16:16 +0200 |
commit | da2189596d9a339d2e6eb2f14137de93b15b354f (patch) | |
tree | a11e6ed2e8f0715fc2d468aa0937ccdf2041fd8a /libavformat/txd.c | |
parent | 1f20fa2da83922cd73b090b7f336ba51e25b1fb3 (diff) | |
parent | 2df0c32ea12ddfa72ba88309812bfb13b674130f (diff) | |
download | ffmpeg-da2189596d9a339d2e6eb2f14137de93b15b354f.tar.gz |
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>
Diffstat (limited to 'libavformat/txd.c')
0 files changed, 0 insertions, 0 deletions