Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:58:49 +0000 (14:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:58:49 +0000 (14:58 +0100)
commit5068bcda95c2a53a9b27d096e52f72f9bac62c8b
treefcd68d78aaf62d7e59cb1d8be708b8621e6a144c
parentd1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe
parent7194330bcd6db8dc5c22e0c162a0992d519307f9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_delogo: fix copying the input frame.

Conflicts:
libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_delogo.c