Merge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 20:41:53 +0000 (21:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 20:43:24 +0000 (21:43 +0100)
commit47c066f22e68fa3cee74c3917d331d34c983ca2a
tree941dbf4830d6ac3fd85d5761a01049ed31e3b1b4
parent7a64f1684178169e38865b38b146f737142f0ba2
parentd69d787dad77f62c89cbc7ea5d301641f45f36e3
Merge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'

* commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3':
  h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

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