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.c | |
| 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.c')
| -rw-r--r-- | libavcodec/h263.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index b08e32e863..41836a809e 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -367,16 +367,3 @@ int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, } return *mot_val; } - - -/** - * Get the GOB height based on picture height. - */ -int ff_h263_get_gob_height(MpegEncContext *s){ - if (s->height <= 400) - return 1; - else if (s->height <= 800) - return 2; - else - return 4; -} |