diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:42:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:42:56 +0100 |
| commit | ec5499d8bac82007bfc966fb1a7b8233375723cf (patch) | |
| tree | be754102ba76fd022b9d30463f06a4131177412b /libavcodec/mpeg4video.h | |
| parent | b239f3f69d1c10a7d12354a9038c5b109661324e (diff) | |
| parent | e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb (diff) | |
| download | ffmpeg-ec5499d8bac82007bfc966fb1a7b8233375723cf.tar.gz | |
Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'
* commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb':
mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec
Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 93c101ecec..1230baa178 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -120,6 +120,7 @@ int ff_mpeg4_decode_video_packet_header(Mpeg4DecContext *ctx); void ff_mpeg4_init_direct_mv(MpegEncContext *s); void ff_mpeg4videodec_static_init(void); int ff_mpeg4_workaround_bugs(AVCodecContext *avctx); +int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size); /** * |