diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:05:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:05:00 +0100 |
| commit | 5459cf411412c7a1d2da7ce6a6955c7d57490a55 (patch) | |
| tree | 18117251ae2ca34fd6895998f9699ef09855427a /.gitignore | |
| parent | d88e674a15dc23ca6bb68173dbb7c12e5d668bb5 (diff) | |
| parent | a8ea936a0a00570f61a16a588821b52f6a3115c2 (diff) | |
| download | ffmpeg-5459cf411412c7a1d2da7ce6a6955c7d57490a55.tar.gz | |
Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'
* commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2':
libilbc: decode directly to the user-provided AVFrame
dpcm: decode directly to the user-provided AVFrame
imc/iac: decode directly to the user-provided AVFrame
gsm: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/dpcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions