diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 01:47:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 01:51:17 +0100 |
| commit | abb6821e43e74bfce1565c4a6ed75cfb666a2e6d (patch) | |
| tree | b00a4cb982289f9047dd452bfeacb2c2bdb40abb /libswresample | |
| parent | 84873794ad922cbcbdb5f62deda6c1ed16668bcc (diff) | |
| parent | 8a2250344b19a343d830a902dbcf4c0b929ea49b (diff) | |
| download | ffmpeg-abb6821e43e74bfce1565c4a6ed75cfb666a2e6d.tar.gz | |
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>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions