diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 04:04:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 04:04:01 +0200 |
| commit | 9ed1aa0465b3377dec860bcfe8144533b9ea9d68 (patch) | |
| tree | 46fb8a64128d22cc7339682a3d9516ed6ea2c908 /libavcodec/movtextdec.c | |
| parent | 188ce941ec01c3292609055d338ec51525e07b34 (diff) | |
| parent | 744b406ff3474e77543bcf86125a2f7bc7deaa18 (diff) | |
| download | ffmpeg-9ed1aa0465b3377dec860bcfe8144533b9ea9d68.tar.gz | |
Merge commit '744b406ff3474e77543bcf86125a2f7bc7deaa18' into release/2.2
* commit '744b406ff3474e77543bcf86125a2f7bc7deaa18':
huffyuv: Check and propagate function return values
Conflicts:
libavcodec/huffyuvdec.c
See: f67a0d115254461649470452058fa3c28c0df294
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/movtextdec.c')
0 files changed, 0 insertions, 0 deletions