diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-04-04 11:37:11 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-04-04 11:37:11 +0200 |
| commit | 28fd79c9db712a2f73ebdbfafa3abbd3040b1a2f (patch) | |
| tree | fdeff3353652d4a7f066e14ec08389dd7e717168 /libavfilter/af_amerge.c | |
| parent | 3d12d106775a5a821b3cb3aaaeadd8cb48f19550 (diff) | |
| parent | 45a1ce2ff7688656aacd53c27de5815a7ec13afe (diff) | |
| download | ffmpeg-28fd79c9db712a2f73ebdbfafa3abbd3040b1a2f.tar.gz | |
Merge commit '45a1ce2ff7688656aacd53c27de5815a7ec13afe'
* commit '45a1ce2ff7688656aacd53c27de5815a7ec13afe':
examples/decode_audio: handle planar audio now produced by the MP2 decoder
This commit is a noop, we use a simpler and more generic method to write
the samples.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions