Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 13:27:48 +0000 (14:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 13:27:48 +0000 (14:27 +0100)
commit73b59cc1bad802612d04c112844aab49953ede64
treefc10f203df63429499223682b39940a2f7cab14f
parenteb2f499e37ee8c890836f80c3ffba57e971fe514
parent4f56e773fe8a554b8c2662650aaf799c2ece2721
Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'

* commit '4f56e773fe8a554b8c2662650aaf799c2ece2721':
  x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
  rtpenc: Start the sequence numbers from a random offset

Conflicts:
libavformat/version.h

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