diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 20:57:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 20:57:37 +0200 |
| commit | 218f58a16a3dd6c1b3eecef18bb45c04439c7799 (patch) | |
| tree | 98205644fd62945cb1ed816744dacc4193941b4d /libavcodec/motion_est.h | |
| parent | 58f63670e173c1113ab231850572be303a21faef (diff) | |
| parent | e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d (diff) | |
Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
mpegvideo: h263: Move all tables to a single file
Conflicts:
libavcodec/h263.h
libavcodec/h263data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.h')
| -rw-r--r-- | libavcodec/motion_est.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h index c6a1691e0b..199ae8da90 100644 --- a/libavcodec/motion_est.h +++ b/libavcodec/motion_est.h @@ -122,7 +122,4 @@ void ff_fix_long_mvs(struct MpegEncContext *s, uint8_t *field_select_table, int field_select, int16_t (*mv_table)[2], int f_code, int type, int truncate); -extern const uint8_t ff_aic_dc_scale_table[32]; -extern const uint8_t ff_h263_chroma_qscale_table[32]; - #endif /* AVCODEC_MOTIONEST_H */ |