1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
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-03-20 18:46:56 -04:00
2012-03-27 11:58:15 -04:00
2012-02-20 15:08:41 -05:00
2012-03-27 20:08:41 +02:00
2012-03-28 10:30:44 +02:00
2012-01-14 04:47:27 +01:00
2011-11-12 20:01:50 +01:00
2012-03-21 03:03:33 +01:00
2012-03-22 20:44:24 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-01-14 01:15:42 +01:00
2012-03-22 13:41:48 +01:00
2011-12-10 11:58:03 +01:00
2012-03-13 01:14:04 +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-02 18:58:19 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-03-26 22:22:51 +02:00
2012-03-26 03:45:45 +02:00
2012-03-26 03:45:45 +02:00
2012-02-14 01:22:38 +01:00
2012-03-03 04:14:37 +01:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-03-21 22:19:23 +01:00
2012-03-28 07:36:56 +02:00
2012-01-07 00:11:43 +01:00
2012-03-22 13:19:42 +01:00
2012-03-13 22:38:45 +01:00
2011-12-17 05:04:56 +01:00
2012-03-13 01:14:04 +01:00
2012-03-24 14:54:12 +01:00
2011-11-11 18:40:19 +01:00
2012-03-26 15:29:14 +02:00
2012-03-19 18:46:34 +01:00
2012-02-14 19:03:10 +01:00
2011-12-13 21:08:43 +01:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-03-21 03:07:43 +01:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-03-24 17:48:03 +01:00
2012-03-09 09:17:07 +01:00
2012-03-25 12:24:15 +02:00
2012-03-28 10:44:43 +02:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-03-27 20:08:41 +02:00
2012-01-23 19:04:35 +01:00
2012-03-18 07:45:41 -07:00
2012-03-21 03:09:04 +01:00
2011-11-12 20:49:53 +01:00