[FFmpeg-cvslog] Merge commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 14:38:01 2013 +0200| [e9f2e9715b2bf7e379174b4ca3d23b11526561c0] | committer: Michael Niedermayer

Merge commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56'

* commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56':
  4xm: refactor decode_p_block

Conflicts:
	libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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