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-09-28 20:30:37 +02:00
2012-10-10 14:13:51 +02:00
2012-06-25 01:58:18 +02:00
2012-05-19 14:30:41 +01:00
2012-08-22 16:41:57 -04:00
2012-05-19 14:30:41 +01:00
2012-10-10 10:49:51 +02:00
2012-10-10 10:49:51 +02:00
2012-10-10 10:49:51 +02:00
2012-10-10 14:13:51 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-07-20 10:17:25 +02:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +00:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-09-22 09:34:56 +02:00
2012-05-09 14:13:34 +01:00
2012-08-12 18:11:27 +02:00
2012-08-22 00:58:44 +02:00
2012-07-02 23:18:04 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-09 14:13:34 +01:00
2012-10-09 14:16:34 +03:00
2012-10-06 09:24:54 +02:00
2012-10-09 08:48:36 +00:00
2012-09-29 16:09:05 +02:00
2012-06-01 18:44:07 +02:00
2012-07-23 22:12:12 +02:00
2012-09-10 00:07:24 +01:00
2012-09-08 12:53:44 +02:00
2012-06-30 13:49:43 +02:00
2012-05-27 15:42:55 +02:00
2012-08-04 09:49:30 +02:00
2012-05-20 10:21:52 +02:00
2012-09-29 16:09:05 +02:00
2012-05-19 14:30:41 +01:00
2012-10-10 14:13:51 +02:00
2012-09-29 16:09:05 +02:00
2012-09-23 15:24:08 +02:00
2012-09-01 01:54:40 +02:00
2012-10-11 15:46:48 +02:00
2012-09-29 16:09:05 +02:00
2012-10-10 14:13:51 +02:00
2012-06-18 11:47:08 +01:00
2012-05-27 15:42:55 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-10-10 10:49:51 +02:00