diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 17:54:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 17:54:47 +0200 |
| commit | 3d820ba9095fe6a28ff25d05776edcbf4b78ed47 (patch) | |
| tree | 65083eaf7faa4f60eff4841adf57e0ff9b6a87a3 /libavdevice/v4l2-common.c | |
| parent | 571effb3307dd41d67ce93e015aca2d3ae0d2841 (diff) | |
| parent | f76e3669bb350ca6df150244f3d28d7dc5599f01 (diff) | |
| download | ffmpeg-3d820ba9095fe6a28ff25d05776edcbf4b78ed47.tar.gz | |
Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'
* commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01':
Decode both parts of Indeo4 IP frames
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
See: 8bfb4d72dd9324fda14bb49dda3468ccba5873e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2-common.c')
0 files changed, 0 insertions, 0 deletions