Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)
commit95275551ef280deadb73d04bad0472486e497115
tree908ac496d72c0f95bb456053bf3a3e3ebf2b8b54
parente99f324c143a2d825b2be260cb6a799dbfe97a10
parentee16a0ced01e6a33b7b01a0b21a0e07c1e1c7884
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  smacker: check frame size validity

Conflicts:
libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/smacker.c