Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:32:52 +0000 (17:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:32:52 +0000 (17:32 +0100)
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
  miscellaneous typo fixes

Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
32 files changed:
1  2 
configure
doc/Doxyfile
doc/developer.texi
libavcodec/4xm.c
libavcodec/aacpsy.c
libavcodec/ac3dec.c
libavcodec/ac3enc.c
libavcodec/acelp_filters.h
libavcodec/bitstream.c
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/h264_direct.c
libavcodec/indeo3data.h
libavcodec/lagarith.c
libavcodec/libfdk-aacenc.c
libavcodec/libtheoraenc.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/ratecontrol.c
libavcodec/resample.c
libavcodec/rv10.c
libavcodec/shorten.c
libavcodec/vorbisdec.c
libavcodec/wmaprodec.c
libavformat/dvenc.c
libavformat/rtpdec_jpeg.c
libavformat/smoothstreamingenc.c
libavformat/spdifenc.c
libswscale/ppc/yuv2yuv_altivec.c
libswscale/swscale.c
tests/audiogen.c
tools/patcheck

diff --cc configure
Simple merge
diff --cc doc/Doxyfile
Simple merge
Simple merge
@@@ -842,7 -796,7 +842,7 @@@ static int decode_frame(AVCodecContext 
                                       cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE);
          // explicit check needed as memcpy below might not catch a NULL
          if (!cfrm->data) {
-             av_log(f->avctx, AV_LOG_ERROR, "realloc falure\n");
 -            av_log(f->avctx, AV_LOG_ERROR, "realloc failure");
++            av_log(f->avctx, AV_LOG_ERROR, "realloc failure\n");
              return -1;
          }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -815,8 -798,8 +815,8 @@@ static int init_pass2(MpegEncContext *s
      RateControlContext *rcc= &s->rc_context;
      AVCodecContext *a= s->avctx;
      int i, toobig;
 -    double fps= 1/av_q2d(s->avctx->time_base);
 +    double fps= get_fps(s->avctx);
-     double complexity[5]={0,0,0,0,0};   // aproximate bits at quant=1
+     double complexity[5]={0,0,0,0,0};   // approximate bits at quant=1
      uint64_t const_bits[5]={0,0,0,0,0}; // quantizer independent bits
      uint64_t all_const_bits;
      uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -51,10 -47,9 +51,10 @@@ struct DVMuxContext 
      AVFifoBuffer     *audio_data[2]; /* FIFO for storing excessive amounts of PCM */
      int               frames;        /* current frame number */
      int64_t           start_time;    /* recording start time */
-     int               has_audio;     /* frame under contruction has audio */
-     int               has_video;     /* frame under contruction has video */
-     uint8_t           frame_buf[DV_MAX_FRAME_SIZE]; /* frame under contruction */
+     int               has_audio;     /* frame under construction has audio */
+     int               has_video;     /* frame under construction has video */
+     uint8_t           frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */
 +    AVTimecode        tc;            /* timecode context */
  };
  
  static const int dv_aaux_packs_dist[12][9] = {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/patcheck
Simple merge