[FFmpeg-cvslog] Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  5 21:39:41 2014 +0100| [7a64f1684178169e38865b38b146f737142f0ba2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a64f1684178169e38865b38b146f737142f0ba2
---