* commit 'e9d394f3':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

See: a9cd12eeMerged-by: Michael Niedermayer <michaelni@gmx.at>