Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:26:39 +0000 (19:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:26:42 +0000 (19:26 +0200)
commitf94124c23e0aeb6ee89b289ce0de54720c17baec
treebdcb45f88547acbe22a3cc137104f55138938f22
parent4aeafbaab891d81c377f92be3969d8d3e6abf379
parent00d7369de06a16f7c8770a899fcb16bcb94b1e20
Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'

* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20':
  vf_fieldorder: log when processing is skipped

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