diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-17 15:37:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-17 15:38:09 +0200 |
| commit | b3dfda8a410dba1ff2a80b4e243befce1d5f79c5 (patch) | |
| tree | a8b57b7522e4e897f9eb95f48450abd2a5c3ec51 /libswscale/utils.c | |
| parent | 2c8d876dea153b387c57d9ec5809780c21414b84 (diff) | |
| parent | 711c970168297683860422e95d6b7e37ee3c8367 (diff) | |
Merge commit '711c970168297683860422e95d6b7e37ee3c8367'
* commit '711c970168297683860422e95d6b7e37ee3c8367':
rv34: Check the return value from ff_rv34_decode_init
Conflicts:
libavcodec/rv30.c
libavcodec/rv40.c
See: b86651a208ee67666a7305b002bc9f14b21dae7f
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions