diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 02:54:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 02:54:58 +0200 |
| commit | de5ec08825918401b604d13c4c49bf6bef01ceb3 (patch) | |
| tree | a1033e948eb6a35a889df9bd010f2eb565d9b0a8 /libavdevice/alldevices.c | |
| parent | a37f2cc5797a9bd09e535f3353d1a6be0e0cfcf4 (diff) | |
| parent | 862f33c10ea38ea49fa4188725df5e5246dbd1d8 (diff) | |
| download | ffmpeg-de5ec08825918401b604d13c4c49bf6bef01ceb3.tar.gz | |
Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'
* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
vf_scale: use the pixfmt descriptor API
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alldevices.c')
0 files changed, 0 insertions, 0 deletions