ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 17
13:17:05 2014 +0200| [019ff7a0c37a25068c99b7b72cc9650a2a47863e] | committer:
Michael Niedermayer
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
avplay: Always free find_stream_info options
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=019ff7a0c37a25068c99b7b72cc9650a2a47863e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
