diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:23:48 +0100 |
| commit | 329a3286d648414b672a983427e5c7d38589f7f9 (patch) | |
| tree | 36ceddc1dd93c08dbcbffec317db574310eaf46e /libavcodec/mpegutils.h | |
| parent | 29be9b5301212d29186a05f262a6ce04ddbc168c (diff) | |
| parent | be039278b5ebd8075d90a3508db2aed5adf59e02 (diff) | |
| download | ffmpeg-329a3286d648414b672a983427e5c7d38589f7f9.tar.gz | |
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegutils.h')
| -rw-r--r-- | libavcodec/mpegutils.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index b20a1397f2..6d59c22424 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -21,8 +21,14 @@ #ifndef AVCODEC_MPEGUTILS_H #define AVCODEC_MPEGUTILS_H +#include <stdint.h> + +#include "libavutil/frame.h" + +#include "avcodec.h" #include "version.h" + /* picture type */ #define PICT_TOP_FIELD 1 #define PICT_BOTTOM_FIELD 2 @@ -108,4 +114,14 @@ #define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12) + +/** + * Draw a horizontal band if supported. + * + * @param h is the normal height, this will be reduced automatically if needed + */ +void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last, + int y, int h, int picture_structure, int first_field, + int low_delay); + #endif /* AVCODEC_PICTTYPE_H */ |