diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:57:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:57:47 +0200 |
| commit | 412015694c083ccbd5f66ffd8b078f53e8a6ab6a (patch) | |
| tree | 1d0248f2b95b4e441428c127ca756fa2d69b7ef3 /libavcodec/mpegvideo.h | |
| parent | ffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d (diff) | |
| parent | 8d695dc411c1ae28477f107d6f7bf2db59af95df (diff) | |
Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'
* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
mpeg: Mark ff_mpeg_set_erpic() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9dc4fb28d6..0cfe7af9ba 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -755,7 +755,6 @@ 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); |