diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:32:38 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:32:38 +0100 |
| commit | 36dad146935a500ef6fd7246b5c216f7af26f9db (patch) | |
| tree | 71c6109c6cda64b9a2655d3d5952806fe352c5b2 /libavcodec/intrax8.h | |
| parent | e5c655b09817da9388a8812b93e9948c44cc00af (diff) | |
| parent | eaeba6f241e0de0e797be10f8fda967ef8489e64 (diff) | |
| download | ffmpeg-streaming-36dad146935a500ef6fd7246b5c216f7af26f9db.zip ffmpeg-streaming-36dad146935a500ef6fd7246b5c216f7af26f9db.tar.gz | |
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.h')
| -rw-r--r-- | libavcodec/intrax8.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index ac31a5f..0fe38d0 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -24,6 +24,7 @@ #include "idctdsp.h" #include "intrax8dsp.h" #include "wmv2dsp.h" +#include "mpegpicture.h" typedef struct IntraX8Context { VLC *j_ac_vlc[4]; // they point to the static j_mb_vlc @@ -46,6 +47,7 @@ typedef struct IntraX8Context { int dquant; int qsum; int loopfilter; + AVFrame *frame; // calculated per frame int quant_dc_chroma; @@ -88,11 +90,12 @@ void ff_intrax8_common_end(IntraX8Context *w); * This function does not use ff_mpv_decode_mb(). * lowres decoding is theoretically impossible. * @param w pointer to IntraX8Context + * @param pict the output Picture containing an AVFrame * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1. * @param quant_offset offset away from zero * @param loopfilter enable filter after decoding a block */ -int ff_intrax8_decode_picture(IntraX8Context *w, int quant, int halfpq, - int loopfilter); +int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict, + int quant, int halfpq, int loopfilter); #endif /* AVCODEC_INTRAX8_H */ |
