Michael Niedermayer
|
672c610d84
|
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-22 22:23:04 +01:00 |
|
Diego Biurrun
|
f9279ee749
|
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
|
2014-03-22 06:17:29 -07:00 |
|
Thilo Borgmann
|
d814a839ac
|
Reinstate proper FFmpeg license for all files.
|
2013-08-30 15:47:38 +00:00 |
|
Reimar Döffinger
|
aeeb0e6deb
|
indeo4, swresample: add some missing static/const to tables.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
2012-01-08 19:11:58 +01:00 |
|
Kostya Shishkov
|
adfe0c942e
|
Indeo 4 decoder
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
|
2011-12-28 15:22:18 +01:00 |
|
Kostya Shishkov
|
08bab32cf1
|
indeo4: add some missing static and const qualifiers
From the patch by Reimar Döffinger.
|
2012-01-12 13:54:41 +01:00 |
|