Suggested-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.4
@@ -15,6 +15,9 @@ libavutil: 2012-10-22 | |||||
API changes, most recent first: | 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 | 2014-08-xx - xxxxxxx - lavc 55.57.1 - avcodec.h | ||||
Deprecate unused FF_IDCT_IPP define and ipp avcodec option. | Deprecate unused FF_IDCT_IPP define and ipp avcodec option. | ||||
Deprecate unused FF_DEBUG_PTS define and pts avcodec option. | Deprecate unused FF_DEBUG_PTS define and pts avcodec option. | ||||
@@ -21,6 +21,7 @@ | |||||
#include "avcodec.h" | #include "avcodec.h" | ||||
#include "idctdsp.h" | #include "idctdsp.h" | ||||
#include "fdctdsp.h" | #include "fdctdsp.h" | ||||
#include "pixblockdsp.h" | |||||
#include "avdct.h" | #include "avdct.h" | ||||
#define OFFSET(x) offsetof(AVDCT,x) | #define OFFSET(x) offsetof(AVDCT,x) | ||||
@@ -117,6 +118,14 @@ int avcodec_dct_init(AVDCT *dsp) | |||||
} | } | ||||
#endif | #endif | ||||
#if CONFIG_PIXBLOCKDSP | |||||
{ | |||||
PixblockDSPContext pdsp; | |||||
ff_pixblockdsp_init(&pdsp, avctx); | |||||
COPY(pdsp, get_pixels); | |||||
} | |||||
#endif | |||||
avcodec_close(avctx); | avcodec_close(avctx); | ||||
av_free(avctx); | av_free(avctx); | ||||
@@ -61,6 +61,10 @@ typedef struct AVDCT { | |||||
* must use AVOptions to set this field. | * must use AVOptions to set this field. | ||||
*/ | */ | ||||
int idct_algo; | int idct_algo; | ||||
void (*get_pixels)(int16_t *block /* align 16 */, | |||||
const uint8_t *pixels /* align 8 */, | |||||
int line_size); | |||||
} AVDCT; | } AVDCT; | ||||
/** | /** | ||||
@@ -29,8 +29,8 @@ | |||||
#include "libavutil/version.h" | #include "libavutil/version.h" | ||||
#define LIBAVCODEC_VERSION_MAJOR 55 | #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, \ | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | ||||
LIBAVCODEC_VERSION_MINOR, \ | LIBAVCODEC_VERSION_MINOR, \ | ||||