Revision 4052cbf1

View differences:

libavcodec/dsputil.c
33 33
#include "faandct.h"
34 34
#include "faanidct.h"
35 35
#include "mathops.h"
36
#include "h263.h"
37 36
#include "snow.h"
38 37
#include "mpegvideo.h"
39 38
#include "config.h"
......
2876 2875
}
2877 2876

  
2878 2877
static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale){
2879
    if(CONFIG_ANY_H263) {
2878
    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
2880 2879
    int x;
2881 2880
    const int strength= ff_h263_loop_filter_strength[qscale];
2882 2881

  
......
2913 2912
}
2914 2913

  
2915 2914
static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale){
2916
    if(CONFIG_ANY_H263) {
2915
    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
2917 2916
    int y;
2918 2917
    const int strength= ff_h263_loop_filter_strength[qscale];
2919 2918

  
......
4807 4806
    c->h264_h_loop_filter_chroma_intra= h264_h_loop_filter_chroma_intra_c;
4808 4807
    c->h264_loop_filter_strength= NULL;
4809 4808

  
4810
    if (CONFIG_ANY_H263) {
4809
    if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
4811 4810
        c->h263_h_loop_filter= h263_h_loop_filter_c;
4812 4811
        c->h263_v_loop_filter= h263_v_loop_filter_c;
4813 4812
    }
libavcodec/h263.h
1
/*
2
 * H263/MPEG4 backend for ffmpeg encoder and decoder
3
 * copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
4
 *
5
 * This file is part of FFmpeg.
6
 *
7
 * FFmpeg is free software; you can redistribute it and/or
8
 * modify it under the terms of the GNU Lesser General Public
9
 * License as published by the Free Software Foundation; either
10
 * version 2.1 of the License, or (at your option) any later version.
11
 *
12
 * FFmpeg is distributed in the hope that it will be useful,
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
 * Lesser General Public License for more details.
16
 *
17
 * You should have received a copy of the GNU Lesser General Public
18
 * License along with FFmpeg; if not, write to the Free Software
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 */
21

  
22
#ifndef AVCODEC_H263_H
23
#define AVCODEC_H263_H
24

  
25
#include "config.h"
26
#include "msmpeg4.h"
27

  
28
#define CONFIG_ANY_H263 (CONFIG_H263_DECODER || CONFIG_H263_ENCODER)
29

  
30
#endif /* AVCODEC_H263_H */
libavcodec/mpegvideo_enc.c
33 33
#include "mpegvideo_common.h"
34 34
#include "mjpegenc.h"
35 35
#include "msmpeg4.h"
36
#include "h263.h"
37 36
#include "faandct.h"
38 37
#include "aandcttab.h"
39 38
#include <limits.h>
libavcodec/x86/dsputil_mmx.c
24 24

  
25 25
#include "libavutil/x86_cpu.h"
26 26
#include "libavcodec/dsputil.h"
27
#include "libavcodec/h263.h"
28 27
#include "libavcodec/mpegvideo.h"
29 28
#include "libavcodec/simple_idct.h"
30 29
#include "dsputil_mmx.h"
......
703 702
        "paddb %%mm1, %%mm6             \n\t"
704 703

  
705 704
static void h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale){
706
    if(CONFIG_ANY_H263) {
705
    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
707 706
    const int strength= ff_h263_loop_filter_strength[qscale];
708 707

  
709 708
    __asm__ volatile(
......
753 752
}
754 753

  
755 754
static void h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale){
756
    if(CONFIG_ANY_H263) {
755
    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
757 756
    const int strength= ff_h263_loop_filter_strength[qscale];
758 757
    DECLARE_ALIGNED(8, uint64_t, temp[4]);
759 758
    uint8_t *btemp= (uint8_t*)temp;
......
2624 2623

  
2625 2624
        c->draw_edges = draw_edges_mmx;
2626 2625

  
2627
        if (CONFIG_ANY_H263) {
2626
        if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
2628 2627
            c->h263_v_loop_filter= h263_v_loop_filter_mmx;
2629 2628
            c->h263_h_loop_filter= h263_h_loop_filter_mmx;
2630 2629
        }

Also available in: Unified diff