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
..
2012-09-08 18:18:34 +02:00
2012-11-11 20:43:28 +01:00
2012-09-08 18:18:34 +02:00
2013-01-06 13:20:23 +01:00
2013-01-09 12:30:14 +01:00
2013-01-09 12:30:14 +01:00
2013-01-08 14:52:43 -05:00
2012-08-23 20:10:57 -04:00