diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 17:59:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 17:59:33 +0100 |
| commit | 3f5f955c5366de1f0dc643d9631b6cc19ba008cd (patch) | |
| tree | ba91ef90132b79390963a0df249ce45da9f02d56 /libswscale | |
| parent | f3acdd44bf37557574dea2c2c6d9771642e9ebbc (diff) | |
| parent | c342132fa8a29692e28c98238e3a31da5c407e42 (diff) | |
| download | ffmpeg-3f5f955c5366de1f0dc643d9631b6cc19ba008cd.tar.gz | |
Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'
* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
frame: copy flags in av_frame_copy_props()
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions