Revision fe037229

View differences:

MAINTAINERS
80 80
    eval.c                              Michael Niedermayer
81 81
  audio and video frame extraction:
82 82
    parser.c
83
  bitsream reading:
83
  bitstream reading:
84 84
    bitstream.c, bitstream.h            Michael Niedermayer
85 85
  CABAC:
86 86
    cabac.h, cabac.c                    Michael Niedermayer
libavcodec/i386/dsputil_mmx.c
175 175
/* 3Dnow specific */
176 176

  
177 177
#define DEF(x) x ## _3dnow
178
/* for Athlons PAVGUSB is prefered */
178
/* for Athlons PAVGUSB is preferred */
179 179
#define PAVGB "pavgusb"
180 180

  
181 181
#include "dsputil_mmx_avg.h"
libavcodec/mpegaudiodec.c
2289 2289
        for(ch=0;ch<s->nb_channels;ch++) {
2290 2290
            g = &granules[ch][gr];
2291 2291
            if(get_bits_count(&s->gb)<0){
2292
                av_log(NULL, AV_LOG_ERROR, "mdb:%d, lastbuf:%d skiping granule %d\n",
2292
                av_log(NULL, AV_LOG_ERROR, "mdb:%d, lastbuf:%d skipping granule %d\n",
2293 2293
                                            main_data_begin, s->last_buf_size, gr);
2294 2294
                skip_bits_long(&s->gb, g->part2_3_length);
2295 2295
                memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid));
libavcodec/utils.c
511 511
{"strict", "strictly conform to all the things in the spec no matter what consequences", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_STRICT, INT_MIN, INT_MAX, V|E, "strict"},
512 512
{"normal", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_NORMAL, INT_MIN, INT_MAX, V|E, "strict"},
513 513
{"inofficial", "allow inofficial extensions", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_INOFFICIAL, INT_MIN, INT_MAX, V|E, "strict"},
514
{"experimental", "allow non standarized experimental things", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|E, "strict"},
514
{"experimental", "allow non standardized experimental things", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|E, "strict"},
515 515
{"b_qoffset", "qp offset between p and b frames", OFFSET(b_quant_offset), FF_OPT_TYPE_FLOAT, 1.25, FLT_MIN, FLT_MAX, V|E},
516 516
{"er", "set error resilience strategy", OFFSET(error_resilience), FF_OPT_TYPE_INT, FF_ER_CAREFUL, INT_MIN, INT_MAX, A|V|D, "er"},
517 517
{"careful", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_CAREFUL, INT_MIN, INT_MAX, V|D, "er"},
......
698 698
{"fastpskip", "fast pskip (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_FASTPSKIP, INT_MIN, INT_MAX, V|E, "flags2"},
699 699
{"aud", "access unit delimiters (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_AUD, INT_MIN, INT_MAX, V|E, "flags2"},
700 700
{"brdo", "b-frame rate-distortion optimization", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BRDO, INT_MIN, INT_MAX, V|E, "flags2"},
701
{"skiprd", "RD optimal MB level residual skiping", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SKIP_RD, INT_MIN, INT_MAX, V|E, "flags2"},
701
{"skiprd", "RD optimal MB level residual skipping", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SKIP_RD, INT_MIN, INT_MAX, V|E, "flags2"},
702 702
{"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, 20.0, FLT_MIN, FLT_MAX, V|E},
703 703
{"deblockalpha", "in-loop deblocking filter alphac0 parameter", OFFSET(deblockalpha), FF_OPT_TYPE_INT, DEFAULT, -6, 6, V|E},
704 704
{"deblockbeta", "in-loop deblocking filter beta parameter", OFFSET(deblockbeta), FF_OPT_TYPE_INT, DEFAULT, -6, 6, V|E},
libavcodec/xan.c
85 85
    return 0;
86 86
}
87 87

  
88
/* This function is used in lieu of memcpy(). This decoder can not use
88
/* This function is used in lieu of memcpy(). This decoder cannot use
89 89
 * memcpy because the memory locations often overlap and
90 90
 * memcpy doesn't like that; it's not uncommon, for example, for
91 91
 * dest = src+1, to turn byte A into  pattern AAAAAAAA.

Also available in: Unified diff