Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 21:39:27 +0000 (22:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 21:40:56 +0000 (22:40 +0100)
commit9f8f2bcab6267be2054211dab9d5824af5517201
treea18789bca7ccd31d58d7413ae6aef312880abac7
parent8b3a681aaa7dc209faa698c189d9b28c102bdc63
parentc3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8
Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'

* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
  formats: Check memory allocations

Conflicts:
libavfilter/formats.c

See: 527ca3985c736ffe077a82fdf3616f0fd571b923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/formats.c