Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac' | Michael Niedermayer | 2014-07-25 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac': qpeldsp: Mark source pointer in qpel_mc_func function pointer const Conflicts: libavcodec/h264qpel_template.c libavcodec/x86/cavsdsp.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
| * | qpeldsp: Mark source pointer in qpel_mc_func function pointer const | Diego Biurrun | 2014-07-25 |
| | | |||
* | | Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a' | Michael Niedermayer | 2014-05-30 |
|/ | | | | | | | | | | | | | | | | | | * commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | dsputil: Split off quarterpel bits into their own context | Diego Biurrun | 2014-05-29 |