diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 02:08:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 02:10:43 +0100 |
| commit | 4a62f477ea846ee1198c8945237147d00b4f9c3d (patch) | |
| tree | e377ae85f65a8b3a88cf26f7ccc24ce4d8444187 /libavfilter/vf_overlay.c | |
| parent | e53061154f42cda93052a2f558e1c4697e3b0c1a (diff) | |
| parent | 6e7b50b4270116ded8b874d76cb7c5b1a0341827 (diff) | |
| download | ffmpeg-4a62f477ea846ee1198c8945237147d00b4f9c3d.tar.gz | |
Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827'
* commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827':
mpegvideo_enc: drop support for reusing the input motion vectors.
Conflicts:
libavcodec/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions