diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 20:16:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 20:16:22 +0100 |
| commit | cde6e328de214ffe8387641cdc1e433a2c2150f3 (patch) | |
| tree | af5983da834523bf9e2315287212a8a87901b202 /libswresample/x86 | |
| parent | ada512f91df6b1ed2fc15bd1b497a09de120ec49 (diff) | |
| parent | 619d5e7db88941cadb8136f805564e885c6c6434 (diff) | |
| download | ffmpeg-cde6e328de214ffe8387641cdc1e433a2c2150f3.tar.gz | |
Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
v4l2: Use the codec descriptor facility
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86')
0 files changed, 0 insertions, 0 deletions