Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 16:27:52 +0000 (18:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 17:16:49 +0000 (19:16 +0200)
commita2e50fa068dc586d5ab50e02bcd049eb702ccf47
tree2894e7bc12980d37ca218993820e6d0d4b524b0f
parent2fa89b27365b1e474d8d2047036c8a8f1377bfe0
parent225f78b7ef589e52bbbb19c97d36de5b27982702
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

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