Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 10:21:36 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 10:24:00 +0000 (12:24 +0200)
commite5558391b5aee8e0a99ac10ba9ecd4727439b69a
tree5f1bbc0d9e39a27ac569179bb021356fdef8c645
parent294af5140132521f11723467c7230e7285702545
parentb8b809908ec547b2609dbac24194f4fd2df61aea
Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'

* commit 'b8b809908ec547b2609dbac24194f4fd2df61aea':
  4xm: forward errors from decode_p_block

Conflicts:
libavcodec/4xm.c

Impossible to be false check has been replaced by av_assert0()

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