Michael Niedermayer
185126415e
Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
* commit 'd80811c94e068085aab797f9ba35790529126f85':
riff: Use the correct logging context
Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ba77fb61f741d9ab3bd12935527556055b2ffb2e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-11-26 01:37:09 +01:00
..
2015-05-23 22:36:02 +02:00
2015-11-26 01:37:09 +01:00
2015-06-08 03:36:22 +02:00
2015-05-04 17:49:36 +02:00
2015-11-26 01:37:09 +01:00
2015-06-08 22:37:41 +02:00
2015-06-19 20:31:44 +02:00
2015-11-26 01:37:09 +01:00
2015-05-29 00:04:41 +02:00
2015-06-01 00:43:50 +02:00
2015-06-19 18:40:49 +02:00
2015-06-18 22:09:01 +02:00
2015-06-18 22:09:01 +02:00
2015-05-13 20:11:37 +02:00
2015-05-29 12:19:47 +02:00
2015-05-11 01:56:11 +02:00
2015-05-26 00:29:36 +02:00
2015-11-12 02:55:46 +01:00
2015-11-26 01:37:09 +01:00
2015-06-07 14:55:10 +02:00
2015-05-11 15:31:55 +02:00
2015-06-05 21:56:09 +02:00
2015-06-18 22:09:01 +02:00
2015-05-30 03:57:20 +02:00
2015-06-08 00:35:43 +02:00
2015-11-12 02:55:45 +01:00
2015-10-15 14:41:32 +02:00
2015-05-17 17:15:03 +02:00
2015-06-06 09:24:50 +02:00
2015-11-12 02:55:46 +01:00
2015-05-11 20:21:48 +02:00
2015-05-12 18:40:16 +02:00
2015-05-06 21:05:16 +02:00
2015-05-12 13:32:23 +02:00
2015-10-09 21:30:46 +02:00
2015-05-22 15:30:31 +02:00
2015-05-26 19:54:41 +02:00
2015-11-12 02:55:47 +01:00
2015-05-31 19:04:52 +02:00
2015-06-08 03:36:22 +02:00
2015-11-26 01:37:09 +01:00
2015-06-09 18:30:24 +02:00
2015-11-26 01:37:09 +01:00
2015-05-31 13:05:12 +02:00
2015-11-26 01:37:09 +01:00
2015-06-01 17:54:58 +02:00
2015-10-20 12:46:22 +02:00
2015-05-17 12:57:27 +02:00
2015-05-25 13:34:34 +02:00
2015-05-26 12:02:44 +02:00
2015-06-09 10:07:11 +02:00
2015-05-27 17:29:18 +02:00
2015-11-12 02:55:45 +01:00
2015-05-10 14:39:27 +02:00
2015-06-02 13:45:47 +02:00
2015-06-08 13:03:29 +02:00
2015-11-12 02:55:46 +01:00
2015-05-31 10:10:16 +03:00
2015-05-20 19:07:26 +02:00
2015-07-19 09:36:34 +02:00
2015-05-10 16:26:58 +02:00
2015-10-09 21:35:11 +02:00
2015-07-18 20:23:45 +02:00
2015-05-10 08:47:53 +02:00
2015-11-12 02:55:45 +01:00
2015-06-18 16:39:09 -03:00
2015-05-25 23:39:56 +02:00
2015-11-26 01:37:09 +01:00
2015-11-26 01:37:09 +01:00
2015-06-04 17:03:34 +02:00
2015-06-07 21:55:46 +02:00
2015-11-18 19:33:32 +01:00
2015-06-01 11:29:05 +02:00
2015-06-01 11:29:05 +02:00
2015-06-08 23:05:01 +02:00
2015-05-12 18:07:32 +02:00
2015-05-12 17:55:40 +02:00
2015-06-03 22:39:27 +02:00
2015-05-15 20:21:37 +02:00
2015-05-27 21:48:47 +02:00
2015-06-02 16:42:33 +02:00
2015-06-08 22:35:53 +02:00
2015-10-09 21:34:38 +02:00
2015-10-09 21:28:20 +02:00
2015-05-11 12:42:38 +02:00
2015-05-11 12:42:38 +02:00
2015-07-08 12:40:10 +02:00
2015-05-24 13:32:53 +02:00
2015-06-18 22:09:01 +02:00
2015-05-27 22:24:00 +02:00
2015-06-09 01:06:32 +02:00
2015-06-08 14:08:52 +02:00
2015-06-08 14:08:52 +02:00
2015-05-11 03:50:01 +02:00
2015-11-16 00:06:20 +01:00
2015-06-08 04:00:45 +02:00
2015-05-11 15:56:16 +02:00
2015-05-11 15:56:16 +02:00
2015-11-26 01:37:09 +01:00
2015-05-17 02:08:58 +02:00
2015-06-09 21:19:57 +02:00
2015-05-15 00:56:43 +02:00
2015-05-22 00:17:53 +02:00
2015-11-12 02:55:46 +01:00
2015-11-26 01:37:09 +01:00
2015-11-12 02:55:47 +01:00
2015-11-26 01:37:09 +01:00