diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 11:21:47 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 11:21:47 +0100 |
commit | 44fa2671e0db0bb1a92c365fb3c9c2d1cd7199ca (patch) | |
tree | 3eede210817e4cd60b1a868cfc74ccf6955495a7 /libavfilter/af_amix.c | |
parent | 5f7887ca8d056d2debdd2c3b205ada7305d9ac07 (diff) | |
parent | 5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70 (diff) | |
download | ffmpeg-44fa2671e0db0bb1a92c365fb3c9c2d1cd7199ca.tar.gz |
Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'
* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
lavc: add a public API for parsing vorbis packets.
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/version.h
libavcodec/vorbis_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions