Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:36:21 +0000 (11:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:36:21 +0000 (11:36 +0200)
commit95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc
tree6269787c5022ccabc0f0ccab1289040c51d9bfde
parenteec9c7af3370ee1a114597686382a4ca029392ca
parent71bf6b41d974229a06921806c333ce98566a5d8a
Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

* commit '71bf6b41d974229a06921806c333ce98566a5d8a':
  libavdevice: use avpriv_open()

Conflicts:
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/bktr.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/oss_audio.c