Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 20:07:27 +0000 (22:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 20:08:11 +0000 (22:08 +0200)
commite874772f70908ad5b1754c0373a35bec08fad547
treec8b46d7ef5123cc18cb2114688246bc35c07dee5
parent94f4bdc4f146bcfa46be341d5aab3221af4cdd57
parent21180b73239c6360aa28496d4879713b7ba4a8e5
Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'

* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
  avplay: Factorize code for adding filters to the filter pipeline

Conflicts:
ffplay.c

See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c