1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer 2f7bd3b516 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  apedec: check bits <= 32.
  cavs: Remove unused code.
  oggenc: fix condition when not to flush due to keyframe granule.
  oggenc: add pagesize option to set preferred page size
  libspeexdec: set frame size in libspeex_decode_init()
  smacker audio: sign-extend the initial 16-bit predicted value

Conflicts:
	libavcodec/apedec.c
	libavcodec/libspeexdec.c
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 00:36:43 +02:00
..
2012-03-20 18:46:56 -04:00
2012-03-27 11:58:15 -04:00
2012-03-27 20:08:41 +02:00
2012-03-21 03:03:33 +01:00
2012-03-22 20:44:24 +01:00
2012-03-22 13:41:48 +01:00
2012-03-20 18:46:56 -04:00
2012-03-21 03:09:58 +01:00
2012-03-23 00:50:43 +01:00
2012-03-28 02:34:06 +02:00
2012-03-26 22:22:51 +02:00
2012-03-31 23:31:56 +02:00
2012-03-26 03:45:45 +02:00
2012-03-30 20:10:39 +02:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-03-28 16:27:08 -06:00
2012-03-22 13:19:42 +01:00
2012-03-24 14:54:12 +01:00
2012-03-26 15:29:14 +02:00
2012-03-19 18:46:34 +01:00
2012-03-21 03:07:43 +01:00
2012-03-19 22:37:06 +01:00
2012-03-24 17:48:03 +01:00
2012-03-31 18:25:44 +02:00
2012-03-25 12:24:15 +02:00
2012-03-28 10:44:43 +02:00
2012-03-27 20:08:41 +02:00
2012-03-21 03:09:04 +01:00