diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:01:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:01:17 +0100 |
| commit | 048e28420172ac5c1ae45f492172197dccbc8d00 (patch) | |
| tree | 340608462bcbbdc29e8d1f1086d1beee0888f4fb /tests/ref/vsynth1/jpeg2000 | |
| parent | e31518e86ee51c7d5b29afdf19a77bdeafe10cca (diff) | |
| parent | abb41f19cc10fea09fb16d9ecc9967b2a78cf7b0 (diff) | |
| download | ffmpeg-048e28420172ac5c1ae45f492172197dccbc8d00.tar.gz | |
Merge commit 'abb41f19cc10fea09fb16d9ecc9967b2a78cf7b0' into release/0.10
* commit 'abb41f19cc10fea09fb16d9ecc9967b2a78cf7b0':
nuv: Reset the frame on resize
nuv: Use av_fast_realloc
nuv: return meaningful error codes.
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth1/jpeg2000')
0 files changed, 0 insertions, 0 deletions