1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 4765f63538 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  xan: Convert to bytestream2
  oggenc: add a page_duration option and deprecate the pagesize option
  x86: lavr: add SSE2/AVX dither_int_to_float()

Conflicts:
	libavcodec/xan.c
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-09 12:30:14 +01:00
..
2013-01-02 23:52:35 +01:00
2012-12-15 11:46:47 +01:00
2012-12-23 20:25:28 +01:00
2013-01-05 10:25:32 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2012-12-24 00:53:55 +01:00
2013-01-06 16:30:02 +01:00
2013-01-01 19:29:04 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00