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)
* qatar/master:
  vf_delogo: fix copying the input frame.

Conflicts:
libavfilter/vf_delogo.c

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

Simple merge