Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 08:08:50 +0000 (10:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 08:08:50 +0000 (10:08 +0200)
commit60657ee37afb5388b75430db95cbce5146731c63
tree0d802ab312d22ed5bc1f42fd3bcaa4bf4e027f28
parent90c8863a749432608b05d2b7d93475e8ebd62bbb
parente7a44f87d07655ec0cd31c315936931674434340
Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'

* commit 'e7a44f87d07655ec0cd31c315936931674434340':
  4xm: refactor fourxm_read_header

Conflicts:
libavformat/4xm.c

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