diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:59:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:08:46 +0100 |
| commit | 533bc4c0a30db6a6a4b75bb1094ad2e25f11ae51 (patch) | |
| tree | bbbbf157d57e32706fb35e0add19bfb9f7e8bcc5 /libavcodec/mpegvideo.h | |
| parent | 3dab9e804afe7f971a2dc6089c5615628fb4d81c (diff) | |
| parent | d66e305bd1b4f3e91ae4e7e549148509d0811672 (diff) | |
Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
er: move relevant fields from Picture to ERPicture
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
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 e519c87d2a..3f41edbd5f 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -830,7 +830,9 @@ void ff_MPV_report_decode_progress(MpegEncContext *s); int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); void ff_set_qscale(MpegEncContext * s, int qscale); +/* Error resilience */ void ff_mpeg_er_frame_start(MpegEncContext *s); +void ff_mpeg_set_erpic(ERPicture *dst, Picture *src); int ff_dct_common_init(MpegEncContext *s); int ff_dct_encode_init(MpegEncContext *s); |