diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 12:06:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 12:06:17 +0200 |
commit | 7acb464f0e8c277a19a19f87f2cc7a71fc6e0bc8 (patch) | |
tree | 5e373d4d2393bee85f19c1c2d0c238c5bc7d49ee /libavutil/frame.h | |
parent | c2555bcbd147d068c47363ba294e9c21cfceb6c7 (diff) | |
parent | e6ed8668597cfea25dfb350a9b4df7fb2efc1d90 (diff) | |
download | ffmpeg-7acb464f0e8c277a19a19f87f2cc7a71fc6e0bc8.tar.gz |
Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'
* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
flvenc: Write proper cropping for VP6 even if there's no extradata
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.h')
0 files changed, 0 insertions, 0 deletions