diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:55:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 15:44:59 +0100 |
| commit | 642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca (patch) | |
| tree | b09ea65812ccdada345d88802afa71016e1b357e /libavcodec/mpegvideo.h | |
| parent | e84194f06024892fc33684c5a1726c97a0c0a45c (diff) | |
| parent | f1d8763a02b5fce9a7d9789e049d74a45b15e1e8 (diff) | |
| download | ffmpeg-642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca.tar.gz | |
Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'
* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
mpegvideo: allocate scratch buffers after linesize is known
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index be23c3e35e..e7607d0c61 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -771,6 +771,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_frame_size_alloc(MpegEncContext *s, int linesize); 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]); @@ -794,7 +795,7 @@ void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); void ff_release_unused_pictures(MpegEncContext *s, int remove_current); int ff_find_unused_picture(MpegEncContext *s, int shared); void ff_denoise_dct(MpegEncContext *s, DCTELEM *block); -void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src); +int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src); int ff_MPV_lowest_referenced_row(MpegEncContext *s, int dir); void ff_MPV_report_decode_progress(MpegEncContext *s); int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); |