diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 18:50:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 18:50:55 +0100 |
| commit | e31518e86ee51c7d5b29afdf19a77bdeafe10cca (patch) | |
| tree | 0014fc08a2473816248fcf861133ffeb9717dce2 /tests/ref/vsynth1 | |
| parent | 1c896e865cfb5fdea82429a0506a1c5ad905a988 (diff) | |
| parent | 36fc320747a768335ae4538a24a5739033b7eb74 (diff) | |
| download | ffmpeg-e31518e86ee51c7d5b29afdf19a77bdeafe10cca.tar.gz | |
Merge commit '36fc320747a768335ae4538a24a5739033b7eb74' into release/0.10
* commit '36fc320747a768335ae4538a24a5739033b7eb74':
nuv: Pad the lzo outbuf
nuv: Do not ignore lzo decompression failures
oma: correctly mark and decrypt partial packets
oma: check geob tag boundary
Conflicts:
libavcodec/nuv.c
libavformat/omadec.c
tests/ref/fate/nuv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth1')
0 files changed, 0 insertions, 0 deletions