diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 15:30:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 15:30:34 +0200 |
| commit | 8846115b1a5c29892fdf2c74747f71d37e16e864 (patch) | |
| tree | 4ab64b8114601175846df80eedfa3ea7d49df657 /libavcodec/mpegvideo.h | |
| parent | 67d501b4f1758ba0783b14da4a6b3abd506792fa (diff) | |
| parent | b16d001b628237c93529c2be169ea5af1be7c9d7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: use ff_MPV_common_frame_size_change()
mpegvideo: add reinit function for frame parameter changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 39f23222d3..1b8791cbce 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -141,6 +141,7 @@ typedef struct Picture{ int32_t *mb_cmp_score; ///< Table for MB cmp scores, for mb decision FIXME remove int b_frame_score; /* */ struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture + int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change) } Picture; /** @@ -758,6 +759,7 @@ void ff_MPV_common_defaults(MpegEncContext *s); void ff_MPV_decode_defaults(MpegEncContext *s); int ff_MPV_common_init(MpegEncContext *s); +int ff_MPV_common_frame_size_change(MpegEncContext *s); void ff_MPV_common_end(MpegEncContext *s); void ff_MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]); int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx); |