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-10-11 15:46:48 +02:00
2012-10-11 15:46:48 +02:00
2012-01-23 23:41:32 +01:00
2012-07-29 02:16:26 +02:00
2012-01-19 01:19:38 +01:00
2012-07-09 22:40:12 +02:00
2012-01-21 12:04:46 +01:00
2012-09-06 16:23:17 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2012-09-27 08:59:37 +02:00
2012-10-11 02:21:28 +02:00
2012-10-10 13:01:27 +02:00
2012-06-01 04:16:23 +02:00
2012-05-30 05:57:56 +02:00
2012-06-07 21:45:52 +02:00
2012-10-08 11:03:27 +02:00
2012-08-01 20:00:01 +02:00
2012-05-30 01:40:54 +02:00
2012-06-07 21:45:52 +02:00