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

34 KiB

Raw Blame History

View Raw