Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:30:54 +0000 (20:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:30:54 +0000 (20:30 +0100)
commitf2e01b693fe45cebce9b8ec3bca7a29746f859be
treeaf5983da834523bf9e2315287212a8a87901b202
parentcde6e328de214ffe8387641cdc1e433a2c2150f3
parent9a26ba971387a348e14f363ddcdcb5bba0b413d1
Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1'

* commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1':
  v4l2: Add support for h264

Conflicts:
libavdevice/v4l2.c

See: 0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>