Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 20:39:41 +0000 (21:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 20:41:01 +0000 (21:41 +0100)
commit7a64f1684178169e38865b38b146f737142f0ba2
tree941dbf4830d6ac3fd85d5761a01049ed31e3b1b4
parent4ba01419215c335e68e6b4fe448f416283bb55ff
parent56de2897a68e3a8795b0b3c593dad1c5832696e0
Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'

* commit '56de2897a68e3a8795b0b3c593dad1c5832696e0':
  h264: Fix memory leak on ff_h264_decode_init() failure

Conflicts:
libavcodec/h264.c

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