[FFmpeg-cvslog] Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 22:13:50 2015 +0200| [2a227fe8799e26fe3c8862438a163f72dca017a5] | committer: Michael Niedermayer

Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'

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

Conflicts:
	libavcodec/ituh263dec.c

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

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