Merge commit '0fea8555ae25124c21f4c4f55a5fa76e9169aa03'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 15:17:50 +0000 (17:17 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 15:17:50 +0000 (17:17 +0200)
commita0ffd66caaae1bff1abebffb36e135abcc8122e6
tree8cf0ee1be6fb39c8336451c5a6c4366f4c008f11
parent7e503828b03804f90733c306154c293cbd15102e
parent0fea8555ae25124c21f4c4f55a5fa76e9169aa03
Merge commit '0fea8555ae25124c21f4c4f55a5fa76e9169aa03'

* commit '0fea8555ae25124c21f4c4f55a5fa76e9169aa03':
  v4l2: use codec descriptors for mapping a codec name to id

Merged-by: Clément Bœsch <u@pkh.me>
libavdevice/v4l2.c