Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Feb 2012 23:30:35 +0000 (00:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Feb 2012 23:30:35 +0000 (00:30 +0100)
commit0e6aa0fef565fdb625673c60276e90c2ea091e8e
treef0b08a7f4b465aaa0d9144e9b837b18294db3df6
parentf929abd0c3643b28a9552512d698cf61ad4d08fa
parentbbeb29133b55b7256d18f5aaab8b5c8e919a173a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adpcm: Clip step_index values read from the bitstream at the beginning of each frame.
  oma: don't read beyond end of leaf_table.
  doxygen: Remove documentation for non-existing parameters; misc small fixes.
  Indeo3: fix crashes on corrupt bitstreams.
  msmpeg4: Replace forward declaration by proper #include.
  segment: implement wrap around
  avf: reorder AVStream and AVFormatContext
  aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

Conflicts:
libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
doc/muxers.texi
libavcodec/aacdec.c
libavcodec/adpcm.c
libavcodec/indeo3.c
libavcodec/msmpeg4.c
libavcodec/wmaprodec.c
libavcodec/wmavoice.c
libavdevice/x11grab.c
libavformat/avformat.h
libavformat/mpegts.h
libavformat/rl2.c
libavutil/avutil.h