Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 08:55:56 +0000 (09:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 08:55:56 +0000 (09:55 +0100)
commitbe5389d58521514ab3cd428977a00834f375b9ee
tree59da1dd5b8a4b09a79bec16e089a687f62ef97cb
parent9138f6da4a3ee0d11947b8593db6b6b05e53fbae
parente70c5b034c4787377e82cab2d5565486baec0c2a
Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
libavformat/swfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.h
libavformat/swfdec.c