Michael Niedermayer
9818bbde53
Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' ...
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
nut: use meaningful error values
FATE: use a less ambiguous end time for filter-trim-time test
Conflicts:
libavformat/nutdec.c
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 12:47:54 +02:00
2013-03-08 02:44:07 +01:00
2013-04-27 11:35:03 +02:00
2013-04-25 23:23:12 +02:00
2012-11-29 13:24:48 +00:00
2013-03-09 15:46:46 +01:00
2013-03-09 15:46:46 +01:00
2012-12-04 15:24:05 +01:00
2013-01-12 17:19:27 +01:00
2013-03-09 15:46:46 +01:00
2013-05-07 05:30:19 +02:00
2012-12-04 15:24:05 +01:00
2012-12-07 11:34:16 +01:00
2012-12-04 14:23:22 +01:00
2013-04-11 13:09:33 +02:00
2012-12-03 01:34:14 +01:00
2013-05-01 11:34:34 +02:00
2013-05-08 12:47:54 +02:00
2013-03-08 02:44:46 +01:00
2013-04-19 02:05:01 +02:00
2013-04-25 09:54:11 +02:00
2013-03-05 11:44:58 +00:00
2013-04-30 11:06:03 +02:00
2013-02-27 21:32:14 +02:00
2013-03-08 15:48:27 +01:00
2013-02-14 17:48:08 +01:00
2013-01-13 13:42:10 +01:00
2013-03-12 21:06:30 +01:00
2012-12-05 13:34:45 +01:00
2013-03-09 15:46:46 +01:00
2013-03-09 15:46:46 +01:00
2012-11-29 13:35:56 +01:00
2012-11-28 14:45:28 +01:00
2013-03-12 21:06:30 +01:00
2013-03-23 12:26:08 +01:00
2013-01-13 13:42:10 +01:00
2013-04-24 19:41:27 +02:00
2013-04-19 22:55:21 +02:00
2013-04-22 19:28:33 +02:00
2013-05-07 11:35:07 +02:00
2013-03-08 02:45:27 +01:00
2012-11-28 14:45:28 +01:00
2013-04-16 01:02:14 +02:00
2013-01-12 17:19:27 +01:00
9818bbde53