diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:38:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:38:20 +0200 |
| commit | 451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c (patch) | |
| tree | 6aba32ee6ccdfb275f6ab0b1866fa3e211eaf649 /libavformat/utils.c | |
| parent | ae7ea2eabf35a28be592b45719e7bd4f7ca4b622 (diff) | |
| parent | 43d676432740c6d5e5234ed343f13902909fd124 (diff) | |
| download | ffmpeg-451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c.tar.gz | |
Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1
* commit '43d676432740c6d5e5234ed343f13902909fd124':
huffyuv: Check and propagate function return values
Conflicts:
libavcodec/huffyuvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions