Michael Niedermayer
d40ff29cac
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
asf: only set index_read if the index contained entries.
cabac: add overread protection to BRANCHLESS_GET_CABAC().
cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
h264: add overread protection to get_cabac_bypass_sign_x86().
h264: reindent get_cabac_bypass_sign_x86().
h264: use struct offsets in get_cabac_bypass_sign_x86().
h264: fix overreads in cabac reader.
wmall: fix seeking.
lagarith: fix buffer overreads.
dvdec: drop unnecessary dv_tablegen.h #include
build: fix doc generation errors in parallel builds
Replace memset(0) by zero initializations.
faandct: Remove FAAN_POSTSCALE define and related code.
dvenc: print allowed profiles if the video doesn't conform to any of them.
avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
FATE: add a test for vp8 with changing frame size.
fate: add kgv1 fate test.
oggdec: calculate correct timestamps in Ogg/FLAC
Conflicts:
libavcodec/4xm.c
libavcodec/cook.c
libavcodec/dvdata.c
libavcodec/dvdsubdec.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-03-29 04:11:10 +02:00
..
2012-02-16 01:34:37 +01:00
2012-03-22 20:59:58 +01:00
2012-03-25 12:22:06 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-02-25 04:00:43 +01:00
2012-03-29 04:11:10 +02:00
2012-03-29 04:11:10 +02:00
2012-02-16 01:34:37 +01:00
2012-03-25 01:56:53 +01:00
2012-03-25 01:56:53 +01:00
2012-03-27 11:59:39 +02:00
2012-03-21 01:33:53 +01:00
2012-03-13 01:14:04 +01:00
2012-03-03 00:23:10 +01:00
2012-02-17 00:35:06 +01:00
2012-03-03 04:30:49 +01:00
2012-02-16 01:34:37 +01:00
2012-03-05 16:27:31 -05:00
2012-02-16 01:34:37 +01:00
2012-03-10 10:43:14 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-03-01 03:17:11 +01:00
2012-03-22 13:15:17 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-03-20 07:53:40 +01:00
2012-03-20 07:53:40 +01:00
2012-03-12 20:42:25 +01:00
2012-02-22 02:24:18 +01:00
2012-03-19 13:33:24 +01:00
2012-03-21 01:33:53 +01:00
2012-02-21 05:10:12 +01:00
2012-02-15 01:52:14 +01:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-03-28 02:37:18 +02:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-03-13 01:56:33 +01:00
2012-03-18 23:39:42 +01:00
2012-02-23 04:31:55 +01:00
2012-03-18 23:39:42 +01:00
2012-03-21 01:33:53 +01:00
2012-03-26 20:03:56 +02:00
2012-02-23 04:31:55 +01:00
2012-03-15 01:27:10 +01:00
2012-03-12 06:04:37 +01:00
2012-02-15 01:52:14 +01:00
2012-03-26 20:52:52 +02:00
2012-03-01 03:17:11 +01:00
2012-03-23 01:27:49 +01:00
2012-03-14 21:51:38 +01:00
2012-03-26 20:03:57 +02:00
2012-03-23 00:50:49 +01:00
2012-03-21 22:19:23 +01:00
2012-03-22 13:56:44 -07:00
2012-02-28 20:48:43 +01:00
2012-03-25 04:25:24 +02:00
2012-03-29 04:11:10 +02:00
2012-03-21 01:33:53 +01:00
2012-02-17 00:35:06 +01:00
2012-03-19 20:49:04 +01:00
2012-03-01 03:17:11 +01:00
2012-03-21 01:33:53 +01:00
2012-03-27 11:59:39 +02:00
2012-02-29 00:30:35 +01:00
2012-03-26 20:52:52 +02:00
2012-03-09 22:25:32 +01:00
2012-03-10 18:32:02 +01:00
2012-03-10 18:01:03 +01:00
2012-03-11 17:39:52 +01:00
2012-03-26 15:05:02 +02:00
2012-03-13 01:14:04 +01:00
2012-03-09 01:22:31 +01:00
2012-02-25 04:00:43 +01:00
2012-03-29 04:11:10 +02:00
2012-03-22 19:51:43 +01:00
2012-03-23 04:29:33 +01:00
2012-03-23 04:29:33 +01:00
2012-03-20 14:39:57 -04:00
2012-03-27 12:52:53 +02:00
2012-02-29 14:26:14 +01:00
2012-03-21 01:33:53 +01:00
2012-03-21 01:33:53 +01:00
2012-02-18 12:26:35 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-03-10 01:12:08 +01:00
2012-02-26 07:30:21 +01:00
2012-03-06 06:03:32 +01:00
2012-03-28 02:34:06 +02:00
2012-02-29 00:30:35 +01:00
2012-03-20 00:03:19 +01:00
2012-03-20 00:03:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-17 00:35:06 +01:00
2012-03-21 01:33:53 +01:00
2012-02-19 01:47:10 +01:00
2012-02-18 17:31:55 +02:00
2012-02-19 01:47:10 +01:00
2012-03-04 04:26:04 +01:00
2012-03-01 16:08:32 +02:00
2012-02-24 02:57:18 +01:00
2012-03-21 01:33:53 +01:00
2012-03-20 00:03:19 +01:00
2012-02-17 00:35:06 +01:00
2012-03-29 04:11:10 +02:00
2012-03-20 00:03:19 +01:00
2012-03-20 00:03:19 +01:00
2012-03-29 04:11:10 +02:00
2012-02-23 16:00:22 +01:00
2012-03-29 04:11:10 +02:00
2012-03-29 04:11:10 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-03-04 04:26:04 +01:00
2012-03-22 13:43:26 +01:00
2012-03-06 06:03:32 +01:00
2012-03-08 02:51:45 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-03-01 03:17:11 +01:00
2012-03-06 06:03:32 +01:00
2012-03-29 04:11:10 +02:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-03-29 04:11:10 +02:00
2012-03-20 00:03:19 +01:00
2012-03-29 04:11:10 +02:00
2012-03-25 12:22:06 +02:00
2012-02-16 01:34:37 +01:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-02-16 01:34:37 +01:00
2012-03-27 11:58:15 -04:00
2012-03-21 01:33:53 +01:00
2012-03-23 10:31:45 +01:00
2012-03-22 23:16:49 +01:00