diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-01 15:25:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 15:25:44 +0200 |
| commit | 8e8fcee4a55de171303ebe526d3cf051522111bf (patch) | |
| tree | fef75d382fc6216a093eeaf80560473dff19d883 /media/ffvpx/libavcodec/mpegutils.h | |
| parent | 79b00fc33b5cb6d56d29b50efac6d62ce3a89018 (diff) | |
| parent | 45c24f05d023a2cd8289ed40a13708392ce2e6a4 (diff) | |
| download | UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.gz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.lz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.xz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.zip | |
Merge pull request #805 from MoonchildProductions/revert-801-update-from-upstream
Revert "Update ffvpx code to 4.0.2"
Diffstat (limited to 'media/ffvpx/libavcodec/mpegutils.h')
| -rw-r--r-- | media/ffvpx/libavcodec/mpegutils.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/media/ffvpx/libavcodec/mpegutils.h b/media/ffvpx/libavcodec/mpegutils.h index 1ed21c19b..9cfadfc4c 100644 --- a/media/ffvpx/libavcodec/mpegutils.h +++ b/media/ffvpx/libavcodec/mpegutils.h @@ -48,6 +48,7 @@ #define MAX_FCODE 7 /* MB types */ +#if !FF_API_MB_TYPE #define MB_TYPE_INTRA4x4 (1 << 0) #define MB_TYPE_INTRA16x16 (1 << 1) // FIXME H.264-specific #define MB_TYPE_INTRA_PCM (1 << 2) // FIXME H.264-specific @@ -69,6 +70,7 @@ #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) #define MB_TYPE_QUANT (1 << 16) #define MB_TYPE_CBP (1 << 17) +#endif #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type @@ -137,12 +139,4 @@ void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last, int y, int h, int picture_structure, int first_field, int low_delay); -/** - * Print debugging info for the given picture. - */ -void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, - uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int *low_delay, - int mb_width, int mb_height, int mb_stride, int quarter_sample); - #endif /* AVCODEC_MPEGUTILS_H */ |