1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer ec1ffae0cd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements.
  qcelp: check output buffer size before decoding
  qcelpdec: fix the return value of qcelp_decode_frame().
  sipr: fix the output data size check and only calculate it once.
  Synchronize various 4CCs and codec tags from FFmpeg.
  qdm2: check output buffer size before decoding
  Fix out of bound reads in the QDM2 decoder.
  Check for out of bound writes in the QDM2 decoder.
  ogg/celt: do not set sample_fmt in the demuxer

Conflicts:
	libavcodec/avcodec.h
	libavcodec/qdm2.c
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-05 04:07:59 +02:00
..
2011-07-31 19:40:08 +02:00
2011-09-26 00:24:01 +02:00
2011-10-04 22:36:33 +02:00
2011-04-17 23:43:54 +02:00
2011-09-12 22:12:14 +02:00
2011-08-14 00:05:36 +02:00
2011-04-04 02:15:12 +02:00
2011-09-10 05:24:39 +02:00
2011-09-28 16:11:01 +02:00
2011-09-25 12:29:20 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-04-09 03:17:07 +02:00
2011-08-09 19:56:25 +02:00
2011-05-05 03:30:24 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-10-04 22:36:33 +02:00
2011-08-20 00:27:38 +02:00
2011-04-07 03:32:26 +02:00
2011-10-04 22:36:33 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-10-03 16:03:29 +02:00
2011-08-09 19:56:25 +02:00
2011-10-01 01:26:55 +02:00
2011-06-02 20:06:00 +01:00
2011-04-04 02:15:12 +02:00
2011-09-29 21:44:03 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-08-01 00:58:49 +02:00
2011-05-30 02:39:26 +02:00
2011-08-25 21:43:30 +02:00
2011-10-04 22:36:33 +02:00