diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 00:57:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 00:57:41 +0100 |
| commit | 0960cc4cc60fa39a1de19f8f744274becb164bef (patch) | |
| tree | 67e37ab27000ee923b1e12666a93d38b06f27961 /libavcodec/amr.h | |
| parent | b546023b9319cbaefb638a2eeac56bdbf53d6f8b (diff) | |
| parent | e3e317e0c015b164b6c2eb8913e393216d78de23 (diff) | |
| download | ffmpeg-0960cc4cc60fa39a1de19f8f744274becb164bef.tar.gz | |
Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'
* commit 'e3e317e0c015b164b6c2eb8913e393216d78de23':
lavc: Compact the side-data passthrough
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amr.h')
0 files changed, 0 insertions, 0 deletions