diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 11:39:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 11:46:08 +0100 |
| commit | 7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582 (patch) | |
| tree | 7b1af6617cd611919d387f58c0e44a4a7dd198ab /libavcodec/escape124.c | |
| parent | 564ae836fb7bf73cddf39a0cc47108b5f067c126 (diff) | |
| parent | 1f3e56b6dcc163a705704e98569d4850a31d651c (diff) | |
| download | ffmpeg-7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582.tar.gz | |
Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'
* commit '1f3e56b6dcc163a705704e98569d4850a31d651c':
gifdec: convert to bytestream2
Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h
See: 3fd60d804996031ceaba9cad0b38652b92551eb0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/escape124.c')
0 files changed, 0 insertions, 0 deletions