diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-28 22:00:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-28 22:02:55 +0100 |
| commit | f21ca39e8156c7957348bf37e9dc9d311488ae14 (patch) | |
| tree | 06c3a17535eed3d6db0f51fa219192d9e9c97d1a /ffserver.c | |
| parent | e975c147e18010a9f96f56b21d0cd0f026eaae0e (diff) | |
| parent | d1916d13e28b87f4b1b214231149e12e1d536b4b (diff) | |
Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'
* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
dsputil/pngdsp: fix signed/unsigned type in end comparison
Conflicts:
libavcodec/dsputil.c
See: 454a11a1c9c686c78aa97954306fb63453299760
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions