Merge commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:44:02 +0000 (12:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 11:04:00 +0000 (13:04 +0200)
commit18e0dd05df136ce049b9827367bbf680a2c12d89
tree9944ff3d0076e2dfa07a3b8dd84ac2c2ee7d55c3
parentff0a382758b89180605554755c4bb3f29ea7e8f8
parente90a6846c2c006fbebd00e1f2789f4a86fafacef
Merge commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef'

* commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef':
  cavsdec: Make sure a sequence header has been decoded before decoding pictures

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