diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 12:57:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 13:08:42 +0100 |
| commit | 714ff44858a07578e592dfabd9e1f0a5edbf80bf (patch) | |
| tree | 4cb4d03407e52ad0ca4a170eff7e95c1eadf095d /ffserver.c | |
| parent | 4ba35194a9d79b80a606aafe8744d82de5b4bcf4 (diff) | |
| parent | 067432c1c95882c7221e694f33d9f3bdbe46de7f (diff) | |
| download | ffmpeg-714ff44858a07578e592dfabd9e1f0a5edbf80bf.tar.gz | |
Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'
* commit '067432c1c95882c7221e694f33d9f3bdbe46de7f':
loco: check that there is data left after decoding a plane.
lagarith: avoid infinite loop in lag_rac_refill()
Conflicts:
libavcodec/loco.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions