Michael Niedermayer
88beb2df98
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
FATE: fix the asyncts test
build: Drop gcc-specific warning flag from header compilation rule
FATE: add a test for the asyncts audio filter.
matroskadec: return more correct error code on read error.
buffersrc: check ff_get_audio_buffer() for errors.
lavfi: check all ff_get_video_buffer() calls for errors.
lavfi: check all avfilter_ref_buffer() calls for errors.
vf_select: avoid an unnecessary avfilter_ref_buffer().
buffersrc: avoid creating unnecessary buffer reference
lavfi: use avfilter_unref_bufferp() where appropriate.
vf_fps: add more error checks.
vf_fps: fix a memleak on malloc failure.
lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
lavfi: add error handling to end_frame().
lavfi: add error handling to draw_slice().
lavfi: add error handling to start_frame().
Conflicts:
Makefile
ffplay.c
libavfilter/buffersrc.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.c
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 23:56:21 +02:00
2012-07-07 19:14:51 +02:00
2012-07-04 00:32:31 +02:00
2012-07-15 15:07:03 +02:00
2012-07-22 22:18:18 +02:00
2012-07-15 15:07:03 +02:00
2012-07-09 22:40:12 +02:00
2012-07-22 22:18:18 +02:00
2012-07-15 15:07:03 +02:00
2012-07-15 15:07:03 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-07-22 22:18:18 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-07-22 09:14:05 +02:00
2012-07-15 15:07:03 +02:00
2012-07-09 08:25:19 +02:00
2012-07-09 22:40:12 +02:00
2012-07-15 15:07:03 +02:00
2012-05-18 23:34:11 +02:00
2012-07-22 12:17:34 +02:00
2012-07-21 16:31:15 -07:00
2012-05-06 16:18:10 +02:00
2012-07-15 15:07:03 +02:00
2012-07-22 22:18:18 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-06-25 13:42:47 +02:00
2012-07-03 01:32:16 +02:00
2012-07-15 15:07:03 +02:00
2012-07-17 23:46:26 +02:00
2012-07-22 23:56:21 +02:00
2012-07-18 17:22:17 +02:00
2012-07-18 17:13:00 +02:00
2012-03-22 13:40:37 +01:00
2012-03-17 11:21:49 +01:00
2012-07-20 21:06:18 +02:00
2012-05-31 17:27:27 +02:00
2012-07-22 23:56:21 +02:00
2012-06-30 14:03:54 +02:00
2012-07-22 23:56:21 +02:00
2012-06-28 22:27:05 +02:00
2012-06-26 11:40:21 +02:00
2012-06-16 15:15:16 +00:00
2012-04-04 16:16:09 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-04 21:03:28 +02:00
2012-06-27 00:34:36 +02:00
2012-07-19 18:44:46 +02:00
2012-07-02 21:19:41 +02:00
2012-06-25 13:42:37 +02:00
2012-06-27 00:34:36 +02:00
2012-07-22 23:56:21 +02:00
2012-05-26 20:45:59 +02:00
2012-04-07 13:57:39 +02:00
2012-05-25 18:54:01 +02:00
2012-05-26 20:46:00 +02:00
2012-04-07 13:57:39 +02:00
2012-07-22 12:17:34 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-03 01:32:16 +02:00
2012-07-22 23:56:21 +02:00
2012-06-20 23:55:17 +02:00
2012-05-18 23:34:11 +02:00
2012-07-22 12:17:34 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 22:18:18 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 22:18:18 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 22:18:18 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-07-15 15:07:03 +02:00
2012-07-22 23:56:21 +02:00
2012-07-15 15:07:03 +02:00
2012-07-08 01:18:15 +02:00
2012-07-15 15:07:03 +02:00
2012-07-22 23:56:21 +02:00
2012-07-02 21:19:41 +02:00
88beb2df98