• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0e6aa0fe
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0e6aa0fe
x11grab.c 20.6 KB