diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:01:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:02:33 +0200 |
| commit | 18a9deedb0b0da2d6675e14ecbb270477b7186b7 (patch) | |
| tree | 9c32cd56dbf8731f55b879b79f9fd1a4cf5ff910 /libavutil/xtea.c | |
| parent | 8f68ef46817f6795ee89b2720a17ea972c3f6639 (diff) | |
| parent | 91d4cfb8127f1de6c4ad173a30fffe584700046d (diff) | |
| download | ffmpeg-18a9deedb0b0da2d6675e14ecbb270477b7186b7.tar.gz | |
Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
apedec: do not buffer decoded samples over AVPackets
Conflicts:
libavcodec/apedec.c
See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xtea.c')
0 files changed, 0 insertions, 0 deletions