Merge commit '56de2897'
* commit '56de2897': h264: Fix memory leak on ff_h264_decode_init() failure Conflicts: libavcodec/h264.c See: 309a931aMerged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment