Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:25:28 +0000 (13:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:28:40 +0000 (13:28 +0200)
commite9348e107bafcf0106c52f582d70fa53716b4ac4
tree7979a4ce08e622100a1fe345a2a9a199b4d3786c
parent9d47333e3eee1d9a31a98ebf67338463943846dc
parente9d394f3fad7e8fd8fc80e3b33cb045bbaceb446
Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'

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

Conflicts:
libavcodec/mlpdec.c

See: a9cd12ee2afb3f3aad783c396816b23d8513f472

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mlpdec.c