diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-01-14 00:08:00 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-01-14 00:08:00 +0000 |
| commit | 82929f55b2e99b55cff355e592d25df4eda2a797 (patch) | |
| tree | 48e18ff88ffa8e96d1567128dac210fbab5260bd /src | |
| parent | 526b5352bd0c2e4c4014ed0f448fe8a63697ca78 (diff) | |
| download | xine-lib-82929f55b2e99b55cff355e592d25df4eda2a797.tar.gz xine-lib-82929f55b2e99b55cff355e592d25df4eda2a797.tar.bz2 | |
Add another CONFIG_ENCODERS guard to kill an implicit fn declaration warning.
CVS patchset: 8504
CVS date: 2007/01/14 00:08:00
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 26 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/snow.c | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index b813b3ab2..0b8a3946a 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -473,6 +473,16 @@ Index: libavcodec/snow.c =================================================================== --- libavcodec/snow.c (revision 7433) +++ libavcodec/snow.c (working copy) +@@ -487,7 +487,9 @@ + #define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : slice_buffer_load_line((slice_buf), (line_num))) + //#define slice_buffer_get_line(slice_buf, line_num) (slice_buffer_load_line((slice_buf), (line_num))) + ++#ifdef CONFIG_ENCODERS + static void iterative_me(SnowContext *s); ++#endif + + static void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, DWTELEM * base_buffer) + { @@ -1982,6 +1982,7 @@ #define P_MV1 P[9] #define FLAG_QPEL 1 //must be 1 @@ -505,6 +515,22 @@ Index: libavcodec/snow.c static void decode_blocks(SnowContext *s){ int x, y; +@@ -3182,6 +3184,7 @@ + } + } + ++#ifdef CONFIG_ENCODERS + static void iterative_me(SnowContext *s){ + int pass, mb_x, mb_y; + const int b_width = s->b_width << s->block_max_depth; +@@ -3406,6 +3409,7 @@ + av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4); + } + } ++#endif + + static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int bias){ + const int level= b->level; @@ -3931,6 +3935,7 @@ } } diff --git a/src/libffmpeg/libavcodec/snow.c b/src/libffmpeg/libavcodec/snow.c index 5e93d40a1..aec0375f6 100644 --- a/src/libffmpeg/libavcodec/snow.c +++ b/src/libffmpeg/libavcodec/snow.c @@ -487,7 +487,9 @@ typedef struct { #define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : slice_buffer_load_line((slice_buf), (line_num))) //#define slice_buffer_get_line(slice_buf, line_num) (slice_buffer_load_line((slice_buf), (line_num))) +#ifdef CONFIG_ENCODERS static void iterative_me(SnowContext *s); +#endif static void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, DWTELEM * base_buffer) { @@ -3182,6 +3184,7 @@ static av_always_inline int check_4block_inter(SnowContext *s, int mb_x, int mb_ } } +#ifdef CONFIG_ENCODERS static void iterative_me(SnowContext *s){ int pass, mb_x, mb_y; const int b_width = s->b_width << s->block_max_depth; @@ -3406,6 +3409,7 @@ static void iterative_me(SnowContext *s){ av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4); } } +#endif static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int bias){ const int level= b->level; |