Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:46:56 +0000 (02:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:46:56 +0000 (02:46 +0200)
commit6e9dbee7c65714e940b5cc56f84b896f2c9ab239
tree0de4bcd865fc20e104c7c78d7a2eb975648a4f1b
parente222cfefcdcb496e47391b53f0391e9c3cb66397
parent45fc73edfe071f9690e8671ed2dc402b1cb02ece
Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'

* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
libavfilter/vf_format.c

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