Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 09:09:26 +0000 (11:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 09:31:14 +0000 (11:31 +0200)
commit82654172ced59236744bb7aceba822462f6b5750
treecfb31c4aa466d56101c3cf4afd9300a14ba03510
parenta550926705fe29e1bc3c674ac302ef7912f02938
parent2f034f255c49050e894ab9b88087c09ebe249f3f
Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'

* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

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