ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 17 
13:28:50 2014 +0200| [ee73a69020a8343e827a21a0de92ca1b05f89588] | committer: 
Michael Niedermayer

Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
        ffplay.c

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to