Michael Niedermayer
40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 03:19:47 +02:00
..
2015-04-07 15:08:59 +02:00
2015-04-07 22:50:07 +02:00
2015-04-08 19:58:32 +02:00
2015-04-20 03:19:47 +02:00
2015-04-07 22:29:54 +02:00
2015-04-19 12:41:59 +01:00
2015-04-16 21:09:32 +02:00
2015-04-18 17:54:04 +02:00
2015-04-20 03:19:47 +02:00
2015-03-19 18:17:16 +01:00
2015-03-27 18:29:46 +01:00
2015-04-03 04:09:34 +02:00
2015-04-17 20:03:16 +02:00
2015-04-03 21:13:50 +02:00
2015-03-26 03:10:27 +01:00
2015-04-10 14:44:53 +02:00
2015-04-10 12:35:02 +02:00
2015-04-20 03:19:47 +02:00
2015-03-22 17:19:25 +01:00
2015-04-03 00:10:09 +02:00
2015-03-29 12:31:00 +02:00
2015-04-20 03:19:47 +02:00
2015-04-17 22:54:17 +02:00
2015-04-20 03:19:47 +02:00
2015-04-06 14:44:33 +02:00
2015-03-30 00:08:57 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-16 13:06:35 +02:00
2015-04-08 14:40:56 +02:00
2015-04-06 01:59:04 +02:00
2015-04-07 15:08:59 +02:00
2015-04-08 12:36:53 +02:00
2015-04-08 12:36:53 +02:00
2015-04-19 16:47:12 +02:00
2015-04-08 12:36:53 +02:00
2015-04-08 20:58:25 +02:00
2015-03-22 03:52:37 +01:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-03-23 20:33:09 +01:00
2015-03-19 13:38:25 +01:00
2015-04-17 17:48:22 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-03 13:26:39 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-03-30 04:32:58 +02:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-04-17 19:01:58 +00:00
2015-04-20 03:19:47 +02:00
2015-03-21 23:18:14 +01:00
2015-04-20 03:19:47 +02:00
2015-04-12 17:41:23 +02:00
2015-04-20 03:19:47 +02:00
2015-03-31 01:11:02 +02:00
2015-04-20 03:19:47 +02:00
2015-04-11 02:26:56 +02:00
2015-04-20 03:19:47 +02:00
2015-04-11 18:53:54 +02:00
2015-04-20 03:19:47 +02:00
2015-04-01 21:34:20 +02:00
2015-04-20 03:19:47 +02:00
2015-04-12 17:14:20 +02:00
2015-04-07 23:21:48 +02:00
2015-04-12 17:14:20 +02:00
2015-04-09 20:58:11 +02:00
2015-03-29 22:10:05 +02:00
2015-04-09 20:58:11 +02:00
2015-03-27 18:29:46 +01:00
2015-03-27 18:29:46 +01:00
2015-04-20 03:19:47 +02:00
2015-04-07 15:08:59 +02:00
2015-03-30 00:08:57 +02:00
2015-04-07 15:08:59 +02:00
2015-04-17 04:48:29 +02:00
2015-04-11 13:50:50 +02:00
2015-04-11 13:51:03 +02:00