mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-22 14:26:52 +00:00
Merge commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'
* commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37':
Move Indeo4 frametypes into common header.
Conflicts:
libavcodec/ivi_common.c
See: d24673a2c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
571effb330