-
Michael Niedermayer authored
* commit 'ad94c6ca': siff: Use the correct type for packet size variables Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8f92c089
* commit 'ad94c6ca': siff: Use the correct type for packet size variables Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>