ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Jan
18 00:38:31 2015 +0100| [ee025a0c6137a07f2a2cd4cb5bd09b90076d1772] | committer:
Michael Niedermayer
Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
cmdutils: Use the correct guard
Conflicts:
cmdutils.c
See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee025a0c6137a07f2a2cd4cb5bd09b90076d1772
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
