Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 09:50:10 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 09:50:39 +0000 (11:50 +0200)
commit57f49fa0edafd82315aa3a409ce1051f7dea6981
tree1b9999a27f951dd24e0961493434043fbd57ba77
parent94914d6909908ae48b33485a042db0f867dfeaf0
parent88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08
Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'

* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
  filtfmts: Avoid null pointer dereference

Conflicts:
libavfilter/filtfmts.c

See: 24326930d87dd7e851c1cc383bc0682d746ffaf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>