ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Feb 19 
21:53:39 2015 +0100| [29d2197d880538550812db720539f8c4c4e89dc3] | committer: 
Michael Niedermayer

Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'

* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
        tests/fate/audio.mak

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29d2197d880538550812db720539f8c4c4e89dc3
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to