* qatar/master: smacker: check frame size validity Conflicts: libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 KiB
13 KiB
* qatar/master: smacker: check frame size validity Conflicts: libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>