diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 22:38:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 22:46:10 +0100 |
| commit | f931b1ef450e67c211c6294788da3a1265c0af81 (patch) | |
| tree | 596731cb8f9c0d46894d547de5ed5f023026e4ab /libavdevice/libdc1394.c | |
| parent | 30cf755548a9c73753db6c405bda935016a86f49 (diff) | |
| parent | 696141e898193311c994b399a8dc60713709092f (diff) | |
| download | ffmpeg-f931b1ef450e67c211c6294788da3a1265c0af81.tar.gz | |
Merge commit '696141e898193311c994b399a8dc60713709092f'
* commit '696141e898193311c994b399a8dc60713709092f':
vf_interlace: use image width rather than linesize
Conflicts:
libavfilter/vf_interlace.c
See: f043965cd5145d8540d55c013b0d809b6a874c53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libdc1394.c')
0 files changed, 0 insertions, 0 deletions