diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:36:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:36:26 +0200 |
| commit | b9be91c03d274be5fa3fcd860ba37bb2fbeca429 (patch) | |
| tree | 0da9031744bf14cf46bd9b351c688e805709d15c /compat | |
| parent | d8441791410a090043a192e6897b11dda7f89d4d (diff) | |
| parent | 05de372350f8720461d3cadba40836546f1bb95c (diff) | |
| download | ffmpeg-b9be91c03d274be5fa3fcd860ba37bb2fbeca429.tar.gz | |
Merge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1
* commit '05de372350f8720461d3cadba40836546f1bb95c':
apedec: do not buffer decoded samples over AVPackets
Conflicts:
libavcodec/apedec.c
See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions