Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 11:41:31 +0000 (12:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 11:41:31 +0000 (12:41 +0100)
commit2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab
tree2822135362bf4bdd0bbe1b2aedd82940425ddb86
parentf34cceb1fc58076ac69bef44bf07d8373e58f83d
parent8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9
Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
  vf_frei0r: adjust error messages

Conflicts:
libavfilter/vf_frei0r.c

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