diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-03-31 10:46:06 +0200 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-31 10:46:06 +0200 |
commit | adc489adc97faf959f955933d198659f6227adb5 (patch) | |
tree | d94ccb713264f90ad6048bfab85ef7fb85807fca /libavcodec/motion_est_template.c | |
parent | e3287077ecff33bd02227b85ec760fe47d796f54 (diff) | |
parent | a3483f79933e8f1fd99d524e3218688e14c59150 (diff) | |
download | ffmpeg-adc489adc97faf959f955933d198659f6227adb5.tar.gz |
Merge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'
* commit 'a3483f79933e8f1fd99d524e3218688e14c59150':
avconv: Drop stray leftover debug output
This commit is a noop, see a283665693e1c9804b2736545dba77d0ee342f9e
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/motion_est_template.c')
0 files changed, 0 insertions, 0 deletions