ffmpeg/libavdevice
Michael Niedermayer cde6e328de Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
  v4l2: Use the codec descriptor facility

Conflicts:
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-02 20:16:22 +01:00
..
2015-01-26 02:04:30 -07:00
2015-01-26 02:04:30 -07:00
2014-04-24 05:12:07 +02:00
2014-08-30 18:02:45 +02:00