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)
commit4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6
tree694f5d2cba955bc53de20f8fb81cb54439ae5279
parent4b03d960220d15cb915c2c8f15970d2f36f25cd9
parentac47e014bbaf5163871a8beb7522015e0bc27615
Merge remote-tracking branch 'qatar/master'

* 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:
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