1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 0e6aa0fef5 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>
2012-02-29 00:30:35 +01:00
..
2012-02-06 20:33:06 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-02-05 17:42:26 +01:00
2012-02-02 14:31:17 +01:00
2011-11-03 20:21:01 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2012-02-02 14:31:17 +01:00
2012-02-18 21:35:49 +01:00
2012-02-18 12:04:14 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-02-23 16:00:22 +01:00
2012-02-28 15:01:20 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-02-23 23:24:14 +01:00
2011-12-30 20:00:53 +01:00