[FFmpeg-cvslog] Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

Michael Niedermayer git at videolan.org
Wed Dec 12 10:01:14 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 12 09:55:56 2012 +0100| [be5389d58521514ab3cd428977a00834f375b9ee] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be5389d58521514ab3cd428977a00834f375b9ee
---





More information about the ffmpeg-cvslog mailing list