1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Michael Niedermayer 526cb36e4b Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
  build: remove references to unused EXTRAOBJS variable
  lavfi: convert input/ouput list compound literals to named objects
  fate: add h263 obmc vsynth tests
  avconv: remove bogus warning when using avconv -h without parameter
  averror: explicitly define AVERROR_* values
  flashsv: propagate inflateReset() errors
  indeo4/5: remove constant parameter num_bands from wavelet recomposition
  mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
  Double motion vector range for HPEL interlaced picture in proper place

Conflicts:
	libavcodec/v210dec.h
	libavfilter/af_aformat.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_channelmap.c
	libavfilter/af_join.c
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/f_setpts.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_select.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_testsrc.c
	libavformat/mxfdec.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 15:46:48 +02:00
..
2012-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
2012-09-01 15:23:39 +02:00
2012-09-02 18:15:08 +02:00
2011-06-30 09:47:32 +01:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-08-25 16:46:50 -04:00
crc
2012-05-15 19:47:18 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-03-02 18:58:19 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-10 12:18:38 +01:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2011-07-04 16:26:26 +01:00
2012-02-26 07:48:45 +01:00
2012-07-29 08:06:30 +02:00
2012-03-27 17:54:04 -07:00
2012-10-08 09:06:25 +00:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2011-07-03 18:19:18 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-08-03 15:18:12 +00:00
2012-07-10 00:04:23 +00:00
2012-05-14 12:50:01 +01:00
ptx
2012-07-17 17:06:24 +00:00
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-06-22 00:16:03 +00:00
sha
2010-08-31 20:07:38 +00:00
smc
2012-02-26 07:48:45 +01:00
2012-05-17 03:29:21 +02:00
2012-07-29 08:06:30 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-06-29 20:20:02 +02:00
2012-07-26 22:22:54 +02:00
2012-09-23 15:24:08 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-06-22 00:16:03 +00:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
2012-06-15 19:10:58 +02:00
2012-06-15 19:10:58 +02:00
w64
2012-02-26 07:48:45 +01:00
2010-08-28 14:51:51 +00:00
2012-07-04 15:10:57 +03:00
2012-01-08 18:33:59 -08:00
2012-03-22 19:52:56 +01:00