diff options
| author | D Richard Felker III <dalias@aerifal.cx> | 2006-04-09 06:04:00 +0000 |
|---|---|---|
| committer | D Richard Felker III <dalias@aerifal.cx> | 2006-04-09 06:04:00 +0000 |
| commit | c4e2a535b3a8b192c144acfaa9f1a7bc8b7f99f3 (patch) | |
| tree | bef1948a2e1a555e5e20482e917f058c4acbab4e /libavcodec | |
| parent | 52dc09a5fe4b97dbeb549c3f9d8dc4c1116f1bcd (diff) | |
| download | ffmpeg-c4e2a535b3a8b192c144acfaa9f1a7bc8b7f99f3.tar.gz | |
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)
Originally committed as revision 5276 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index ccb2720115..c1ae6b64d5 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -553,11 +553,10 @@ void ff_clean_mpeg4_qscales(MpegEncContext *s){ #endif //CONFIG_ENCODERS +#define tab_size (sizeof(s->direct_scale_mv[0])/sizeof(int16_t)) +#define tab_bias (tab_size/2) + static void ff_mpeg4_init_direct_mv(MpegEncContext *s){ - //FIXME table is stored in MpegEncContext for thread-safety, - // but a static array would be faster - static const int tab_size = sizeof(s->direct_scale_mv[0])/sizeof(int16_t); - static const int tab_bias = (tab_size/2); int i; for(i=0; i<tab_size; i++){ s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time; @@ -566,8 +565,6 @@ static void ff_mpeg4_init_direct_mv(MpegEncContext *s){ } static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){ - static const int tab_size = sizeof(s->direct_scale_mv[0])/sizeof(int16_t); - static const int tab_bias = (tab_size/2); int xy= s->block_index[i]; uint16_t time_pp= s->pp_time; uint16_t time_pb= s->pb_time; @@ -595,6 +592,9 @@ static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, } } +#undef tab_size +#undef tab_bias + /** * * @return the mb_type |