diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:58:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:58:37 +0200 |
| commit | 7d42ede8fec4e074e4352ddee8238bd46317e12e (patch) | |
| tree | 18783d60243d9f4e6b7658f96324785715cb3862 /doc/examples/decoding_encoding.c | |
| parent | 2ec8e46550dc6a7df34d253484b43c47de833348 (diff) | |
| parent | 4a6622550a4a4bf4690ea7d9fe42210a30a67936 (diff) | |
| download | ffmpeg-7d42ede8fec4e074e4352ddee8238bd46317e12e.tar.gz | |
Merge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10
* commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936':
huffyuv: Check and propagate function return values
Conflicts:
libavcodec/huffyuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions