diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 04:11:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 04:11:21 +0200 |
| commit | f6c524a9399f854602975c7c83c377fc7a4c0d5e (patch) | |
| tree | c8b06c11db7fd2cdac568a884e8d3ada13a50959 /libavcodec/h263.h | |
| parent | 78f50e7eb69437fd108c82f963e7add5e9faa36e (diff) | |
| parent | 0c69164f451cc9ca6ce9d6e7568083e2776bc845 (diff) | |
| download | ffmpeg-f6c524a9399f854602975c7c83c377fc7a4c0d5e.tar.gz | |
Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
h263: Convert function to macro
Conflicts:
libavcodec/h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263.h')
| -rw-r--r-- | libavcodec/h263.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 0d645530ee..954889cedd 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -40,6 +40,8 @@ #define CBPY_VLC_BITS 6 #define TEX_VLC_BITS 9 +#define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4) + extern const AVRational ff_h263_pixel_aspect[16]; extern const uint8_t ff_h263_cbpy_tab[16][2]; @@ -121,7 +123,6 @@ int av_const h263_get_picture_format(int width, int height); void ff_clean_h263_qscales(MpegEncContext *s); int ff_h263_resync(MpegEncContext *s); -int ff_h263_get_gob_height(MpegEncContext *s); void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); |