Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:16:22 +0000 (20:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:16:22 +0000 (20:16 +0100)
commitcde6e328de214ffe8387641cdc1e433a2c2150f3
treeaf5983da834523bf9e2315287212a8a87901b202
parentada512f91df6b1ed2fc15bd1b497a09de120ec49
parent619d5e7db88941cadb8136f805564e885c6c6434
Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'

* commit '619d5e7db88941cadb8136f805564e885c6c6434':
  v4l2: Use the codec descriptor facility

Conflicts:
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/v4l2.c