Michael Niedermayer
024a5f72ee
Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'
* commit '9e0f14f16cfc9456a691655fda7d01090bffe47e':
lavc: Make pointers to ff_cropTbl const
vp3: Embed idct_permutation array directly in VP3DecoderContext
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 12:47:49 +02:00
..
2013-03-13 04:07:41 +01:00
2013-04-08 12:47:49 +02:00
2013-03-13 04:07:41 +01:00
2013-02-07 13:09:35 +01:00
2013-03-13 04:07:41 +01:00
2013-02-26 13:05:10 +01:00
2013-03-13 04:07:41 +01:00
2013-04-08 12:47:49 +02:00