diff options
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/avdct.c | 9 | ||||
| -rw-r--r-- | libavcodec/avdct.h | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
4 files changed, 18 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index caff54112b..6ba3de5c58 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h + Add get_pixels() to AVDCT + 2014-08-xx - xxxxxxx - lavc 55.57.1 - avcodec.h Deprecate unused FF_IDCT_IPP define and ipp avcodec option. Deprecate unused FF_DEBUG_PTS define and pts avcodec option. diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c index 58f4974b49..252125601b 100644 --- a/libavcodec/avdct.c +++ b/libavcodec/avdct.c @@ -21,6 +21,7 @@ #include "avcodec.h" #include "idctdsp.h" #include "fdctdsp.h" +#include "pixblockdsp.h" #include "avdct.h" #define OFFSET(x) offsetof(AVDCT,x) @@ -117,6 +118,14 @@ int avcodec_dct_init(AVDCT *dsp) } #endif +#if CONFIG_PIXBLOCKDSP + { + PixblockDSPContext pdsp; + ff_pixblockdsp_init(&pdsp, avctx); + COPY(pdsp, get_pixels); + } +#endif + avcodec_close(avctx); av_free(avctx); diff --git a/libavcodec/avdct.h b/libavcodec/avdct.h index 4c9d00f904..4190203c24 100644 --- a/libavcodec/avdct.h +++ b/libavcodec/avdct.h @@ -61,6 +61,10 @@ typedef struct AVDCT { * must use AVOptions to set this field. */ int idct_algo; + + void (*get_pixels)(int16_t *block /* align 16 */, + const uint8_t *pixels /* align 8 */, + int line_size); } AVDCT; /** diff --git a/libavcodec/version.h b/libavcodec/version.h index e794635d59..7a7a2e9b21 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 71 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 72 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |