diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:55:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 15:44:59 +0100 |
| commit | 642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca (patch) | |
| tree | b09ea65812ccdada345d88802afa71016e1b357e /libavcodec/cavs.h | |
| parent | e84194f06024892fc33684c5a1726c97a0c0a45c (diff) | |
| parent | f1d8763a02b5fce9a7d9789e049d74a45b15e1e8 (diff) | |
| download | android_external_ffmpeg-642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca.tar.gz android_external_ffmpeg-642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca.tar.bz2 android_external_ffmpeg-642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca.zip | |
Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'
* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
mpegvideo: allocate scratch buffers after linesize is known
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavs.h')
| -rw-r--r-- | libavcodec/cavs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 039053dddb..c99ae95ea4 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -253,7 +253,7 @@ void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC, enum cavs_mv_pred mode, enum cavs_block size, int ref); void ff_cavs_init_mb(AVSContext *h); int ff_cavs_next_mb(AVSContext *h); -void ff_cavs_init_pic(AVSContext *h); +int ff_cavs_init_pic(AVSContext *h); void ff_cavs_init_top_lines(AVSContext *h); int ff_cavs_init(AVCodecContext *avctx); int ff_cavs_end (AVCodecContext *avctx); |