Merge commit 'e930b112d14d7acd050d5087d11b6dd4c56a8e4e' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 17:04:22 +0000 (18:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 17:04:29 +0000 (18:04 +0100)
commit1c896e865cfb5fdea82429a0506a1c5ad905a988
treede08841098f271ff27fe486ea8e87019693bd5cc
parent39d76907c9fb8ac95bf0fe5ef95b50089ec564a9
parente930b112d14d7acd050d5087d11b6dd4c56a8e4e
Merge commit 'e930b112d14d7acd050d5087d11b6dd4c56a8e4e' into release/0.10

* commit 'e930b112d14d7acd050d5087d11b6dd4c56a8e4e':
  oma: refactor seek function
  8bps: Bound-check the input buffer
  rtmp: Do not misuse memcmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/8bps.c
libavformat/omadec.c
libavformat/rtmppkt.c
libavformat/rtmppkt.h
libavformat/rtmpproto.c