diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-19 11:01:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-19 11:11:34 +0200 |
| commit | 2a5f4c1ea2c787a305cba626e74a535aee480300 (patch) | |
| tree | 7685456045442ffcfe4e7e2bd4ff3c3248b5aab4 /libavdevice/v4l2enc.c | |
| parent | 5d2a83571b0a3beaeced8ec3538159507fa7b96c (diff) | |
| parent | 2b72f8ac320c8c5087b1bd0589fc3df132eb42bc (diff) | |
| download | ffmpeg-2a5f4c1ea2c787a305cba626e74a535aee480300.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Seek by sector properly
Conflicts:
libavformat/wtvdec.c
See: a0d13d84a928110b0e99ea16d17fd758fcbde35f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2enc.c')
0 files changed, 0 insertions, 0 deletions