diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-14 10:35:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-14 10:38:11 +0200 |
| commit | 86fe16a763abf2d44a9d3c2ed6d19324239731e4 (patch) | |
| tree | d81418febd38d65bb8deaa9d0cc46a83bdcd74b5 /libavcodec/rtjpeg.c | |
| parent | 7ec7d626a12164ef4195c57f5a016c9e0e26f2f5 (diff) | |
| parent | 075dbc185521f193c98b896cd63be3ec2613df5d (diff) | |
Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d'
* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
nuv: Pad the lzo outbuf
Conflicts:
libavcodec/nuv.c
See: 95e1dfee76c9ecdf70037b7e792897bc6e3d460b
See: 266f6eefc603dd3c34be7de94eec5c9c293b80f1
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/rtjpeg.c')
0 files changed, 0 insertions, 0 deletions