[FFmpeg-cvslog] Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'
Michael Niedermayer
git at videolan.org
Wed May 8 12:53:22 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 8 12:47:54 2013 +0200| [9818bbde5303f3618c6f428a3ab75ae916821a5d] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9818bbde5303f3618c6f428a3ab75ae916821a5d
---
More information about the ffmpeg-cvslog
mailing list