Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 10:10:05 +0000 (12:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 10:12:33 +0000 (12:12 +0200)
commit294af5140132521f11723467c7230e7285702545
treecde71a2d89ca5efe92c7314f8f413f60f5948404
parent4027e136635759999ffb5fa16d1053f26c1dec5e
parent50ec1db62d977b6e864f315a53c1c580a6d7efa4
Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'

* commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4':
  4xm: fold last_picture lazy allocation in decode_p_frame

Conflicts:
libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/4xm.c