Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Nov 2011 23:20:29 +0000 (00:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Nov 2011 23:20:29 +0000 (00:20 +0100)
* qatar/master:
  adtsenc: Check frame size.
  txd: Fix order of operations.
  APIchanges: fill in some blanks
  timer: fix misspelling of "decicycles"
  Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
  indeo3: cosmetics
  md5proto: Fix order of operations.
  dca: Replace oversized unused get_bits() with skip_bits_long().

Conflicts:
doc/APIchanges
libavformat/mmsh.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
25 files changed:
1  2 
doc/APIchanges
libavcodec/dca.c
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/indeo3.c
libavcodec/mjpeg2jpeg_bsf.c
libavcodec/s302m.c
libavcodec/txd.c
libavcodec/vaapi_h264.c
libavcodec/vaapi_mpeg2.c
libavcodec/vaapi_mpeg4.c
libavcodec/vaapi_vc1.c
libavcodec/vda_h264.c
libavformat/a64.c
libavformat/adtsenc.c
libavformat/amr.c
libavformat/md5proto.c
libavformat/mmsh.c
libavformat/mpeg.c
libavformat/mpegtsenc.c
libavformat/rsodec.c
libavformat/rsoenc.c
libavformat/rtpdec_mpeg4.c
libavutil/timer.h

diff --cc doc/APIchanges
@@@ -13,16 -13,7 +13,16 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
- 2011-xx-xx - xxxxxxx - lavu 51.18.0
 +2011-xx-xx - xxxxxxx - lavu 51.28.1
 +  Add av_get_alt_sample_fmt() to samplefmt.h.
 +
 +2011-11-03 - 96949da - lavu 51.23.0
 +  Add av_strcasecmp() and av_strncasecmp() to avstring.h.
 +
 +2011-10-20 - b35e9e1 - lavu 51.22.0
 +  Add av_strtok() to avstring.h.
 +
+ 2011-11-23 - bbb46f3 - lavu 51.18.0
    Add av_samples_get_buffer_size(), av_samples_fill_arrays(), and
    av_samples_alloc(), to samplefmt.h.
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -116,10 -108,9 +116,11 @@@ static int txd_decode_frame(AVCodecCont
      } else if (depth == 16) {
          switch (d3d_format) {
          case 0:
-             if (!flags&1) goto unsupported;
+             if (!(flags & 1))
+                 goto unsupported;
          case FF_S3TC_DXT1:
 +            if (buf_end - cur < (w/4) * (h/4) * 8)
 +                return AVERROR_INVALIDDATA;
              ff_decode_dxt1(cur, ptr, w, h, stride);
              break;
          case FF_S3TC_DXT3:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -406,8 -366,5 +406,7 @@@ URLProtocol ff_mmsh_protocol = 
      .name      = "mmsh",
      .url_open  = mmsh_open,
      .url_read  = mmsh_read,
-     .url_write = NULL,
 +    .url_seek  = mmsh_seek,
      .url_close = mmsh_close,
 +    .url_read_seek  = mmsh_read_seek,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge