eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 14:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'

Browse Source 
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
  mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-17 13:23:48 +01:00
parent 29be9b5301 be039278b5
commit 329a3286d6
6 changed files with 100 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mpegutils.h
View File

@@ -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 */