diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 03:19:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 03:29:33 +0100 |
| commit | f1db3f5f593138a9704dc3e4e91871e59289c843 (patch) | |
| tree | 4a80d37095b9908be0a7fc9faa44cc0f7a958e4c /libavcodec/mpegvideo.h | |
| parent | 08667c26780dcdf2ef9ce410b2c78931a1e94e83 (diff) | |
| parent | c99307caee01441cfde24f3b7b0db3037b7022dc (diff) | |
| download | ffmpeg-f1db3f5f593138a9704dc3e4e91871e59289c843.tar.gz | |
Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'
* commit 'c99307caee01441cfde24f3b7b0db3037b7022dc':
mpegvideo: make frame_size_alloc() 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 030ba837da..857b297a65 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -793,7 +793,6 @@ 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, int16_t block[12][64]); |