[FFmpeg-cvslog] Merge commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 17 10:30:38 2013 +0200| [bd71071066602a9aa542286829f33eddc9bec615] | committer: Michael Niedermayer

Merge commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e'

* commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e':
  h261: check the mtype index

Conflicts:
	libavcodec/h261dec.c

The right half of the check is impossible to be true and thus replaced by
an assert()

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

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