diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 03:04:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 03:12:10 +0100 |
| commit | 08667c26780dcdf2ef9ce410b2c78931a1e94e83 (patch) | |
| tree | fe3224f5d4fcd36b3afc3d843e90d2d5aa62761a /libavcodec/mpegvideo.h | |
| parent | e3b7f0e184a0f21ef7e5c78e180fef258f9c73aa (diff) | |
| parent | 0b0a7a751de02464a33717e70352f696372ba1c4 (diff) | |
Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'
* commit '0b0a7a751de02464a33717e70352f696372ba1c4':
mpegvideo: move encode-only parts of common_end() to encode_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 14f0a09cd8..030ba837da 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -957,6 +957,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src); void ff_mpeg_unref_picture(MpegEncContext *s, Picture *picture); +void ff_free_picture_tables(Picture *pic); #endif /* AVCODEC_MPEGVIDEO_H */ |