Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 00:47:06 +0000 (01:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 00:51:17 +0000 (01:51 +0100)
commitabb6821e43e74bfce1565c4a6ed75cfb666a2e6d
treeb00a4cb982289f9047dd452bfeacb2c2bdb40abb
parent84873794ad922cbcbdb5f62deda6c1ed16668bcc
parent8a2250344b19a343d830a902dbcf4c0b929ea49b
Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'

* commit '8a2250344b19a343d830a902dbcf4c0b929ea49b':
  jv: detect partial packets in the demuxer

Conflicts:
libavformat/jvdec.c

See: 9d0c71e5e34dec2c6246bf47da8d9674c92f85c1
See: b948ab8132e24d215072120e210139dc456d4997
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/jvdec.c
tests/ref/fate/jv-demux