# HG changeset patch # User benoit # Date 1182412428 0 # Node ID b215d5a5fa9a6db0f1fb51c2d34a5dcbb7c8f844 # Parent ea61020e5e87c2c933ff55f639321dfe14bcaeef static (inline) X => ff_X patch by Denis Fortin: \fortin nerim net/ original thread: [FFmpeg-devel] [PATCH] wmv3 encoder : msmpeg4.c changes date: 06/19/2007 09:54 PM diff -r ea61020e5e87 -r b215d5a5fa9a msmpeg4.c --- a/msmpeg4.c Thu Jun 21 07:52:06 2007 +0000 +++ b/msmpeg4.c Thu Jun 21 07:53:48 2007 +0000 @@ -61,7 +61,7 @@ static uint32_t v2_dc_lum_table[512][2]; static uint32_t v2_dc_chroma_table[512][2]; -static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n); +void ff_msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n); static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, int n, int coded, const uint8_t *scantable); static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); @@ -247,7 +247,7 @@ return size; } -static void find_best_tables(MpegEncContext * s) +void ff_find_best_tables(MpegEncContext * s) { int i; int best =-1, best_size =9999999; @@ -317,7 +317,7 @@ /* write MSMPEG4 compatible frame header */ void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) { - find_best_tables(s); + ff_find_best_tables(s); align_put_bits(&s->pb); put_bits(&s->pb, 2, s->pict_type - 1); @@ -534,7 +534,7 @@ s->mv_bits += get_bits_diff(s); for (i = 0; i < 6; i++) { - msmpeg4_encode_block(s, block[i], i); + ff_msmpeg4_encode_block(s, block[i], i); } s->p_tex_bits += get_bits_diff(s); } else { @@ -593,7 +593,7 @@ s->misc_bits += get_bits_diff(s); for (i = 0; i < 6; i++) { - msmpeg4_encode_block(s, block[i], i); + ff_msmpeg4_encode_block(s, block[i], i); } s->i_tex_bits += get_bits_diff(s); s->i_count++; @@ -852,7 +852,7 @@ /* Encoding of a block. Very similar to MPEG4 except for a different escape coding (same as H263) and more vlc tables. */ -static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n) +void ff_msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n) { int level, run, last, i, j, last_index; int last_non_zero, sign, slevel; diff -r ea61020e5e87 -r b215d5a5fa9a wmv2.c --- a/wmv2.c Thu Jun 21 07:52:06 2007 +0000 +++ b/wmv2.c Thu Jun 21 07:53:48 2007 +0000 @@ -261,7 +261,7 @@ } for (i = 0; i < 6; i++) { - msmpeg4_encode_block(s, block[i], i); + ff_msmpeg4_encode_block(s, block[i], i); } } #endif //CONFIG_WMV2_ENCODER