Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314' | Michael Niedermayer | 2014-07-19 |
|\ | | | | | | | | | | | | | * commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314': fdct: Move x86-specific declarations to a header in the x86 directory Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
| * | fdct: Move x86-specific declarations to a header in the x86 directory | Diego Biurrun | 2014-07-19 |
| | | |||
* | | Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' | Michael Niedermayer | 2014-07-08 |
|/ | | | | | | | | | | | | | | | | | | * commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3': dsputil: Split off FDCT bits into their own context Conflicts: configure libavcodec/Makefile libavcodec/asvenc.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | dsputil: Split off FDCT bits into their own context | Diego Biurrun | 2014-07-07 |