Files
ffmpeg-rockchip/libavformat
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-02-06 20:33:06 +01:00
2011-12-19 11:57:34 +01:00
2012-03-13 01:14:04 +01:00
2012-03-03 04:30:49 +01:00
2011-12-30 20:00:53 +01:00
2012-03-30 05:16:15 +02:00
2012-03-26 20:03:56 +02:00
2012-03-31 12:37:42 +02:00
2012-03-23 01:27:49 +01:00
2012-03-31 12:37:42 +02:00
2012-03-31 12:37:42 +02:00
2012-03-10 18:01:03 +01:00
2012-03-26 15:05:02 +02:00
2012-02-02 14:31:17 +01:00
2012-03-13 01:14:04 +01:00
2011-12-20 22:38:53 +01:00
2012-03-27 12:52:53 +02:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-03-28 02:34:06 +02:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2011-12-30 20:00:53 +01:00
2012-03-23 10:31:45 +01:00