ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Mar 2
20:16:22 2015 +0100| [cde6e328de214ffe8387641cdc1e433a2c2150f3] | committer:
Michael Niedermayer
Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
v4l2: Use the codec descriptor facility
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde6e328de214ffe8387641cdc1e433a2c2150f3
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
