Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 20:13:50 +0000 (22:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 20:14:25 +0000 (22:14 +0200)
commit2a227fe8799e26fe3c8862438a163f72dca017a5
tree0d35c90d18c9806bc2f78d8d90b18e75324b2b2e
parent5585da7c5e47810b8433f54bea5ff947251b3055
parent0a49a62f998747cfa564d98d36a459fe70d3299b
Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'

* commit '0a49a62f998747cfa564d98d36a459fe70d3299b':
  h263: Always check both dimensions

Conflicts:
libavcodec/ituh263dec.c

See: 62006b539ddda23594febf0fcb2f21c03de60457
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ituh263dec.c