update for 1.2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
Revert "pnm: remove nonsense code"

Breaks decoding pgms with 255 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.

This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933.
(cherry picked from commit 768e40b451a459fefaceed6b1b3d6e70c93596ac)

Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
avcodec/kmvc: fix MV checks

Fixes Ticket2813
Fixes regression since 70b5583

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3cd8aaa2b2e78faf039691e1c31ff4f8d94e3bc6)
Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
FFmpeg re-sync with f9c87262
Merge branch 'master' of code.mythtv.org:mythtv