[FFmpeg-cvslog] Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 11:36:21 2013 +0200| [95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc] | committer: Michael Niedermayer

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

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

Conflicts:
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc
---