diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:36:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:36:21 +0200 |
| commit | 95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc (patch) | |
| tree | 6269787c5022ccabc0f0ccab1289040c51d9bfde /libavformat/format.c | |
| parent | eec9c7af3370ee1a114597686382a4ca029392ca (diff) | |
| parent | 71bf6b41d974229a06921806c333ce98566a5d8a (diff) | |
| download | ffmpeg-95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc.tar.gz | |
Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'
* commit '71bf6b41d974229a06921806c333ce98566a5d8a':
libavdevice: use avpriv_open()
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/format.c')
0 files changed, 0 insertions, 0 deletions