diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 05:43:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 05:43:42 +0100 |
| commit | fd856693defaa922dbee6a2fa90cc23f447cbaef (patch) | |
| tree | 96b5b0b3a4077dfa8a6c7cc80b50131d038ea8e9 /libavcodec/cavsdec.c | |
| parent | a5c3f596d1f7e092f928f48e8a21de5096d21e05 (diff) | |
| parent | f1476459b7013d306eb911573f1dc81e74ccd082 (diff) | |
| download | ffmpeg-fd856693defaa922dbee6a2fa90cc23f447cbaef.tar.gz | |
Merge commit 'f1476459b7013d306eb911573f1dc81e74ccd082' into release/1.1
* commit 'f1476459b7013d306eb911573f1dc81e74ccd082':
vmnc: K&R formatting cosmetics
flashsv: Check diff_start diff_height values
dsputil/pngdsp: fix signed/unsigned type in end comparison
Conflicts:
libavcodec/dsputil.c
libavcodec/flashsv.c
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
0 files changed, 0 insertions, 0 deletions