Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:28:15 +0000 (12:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:31:59 +0000 (12:31 +0100)
commit21ff626ce0a6f3adf4b387e622e54a57c8e90fb0
tree516f52ac3ee910967016cb8175ebec9d69a9cafb
parent900fff89c9ede6ecd549397384007890fd8c8c6c
parent01eac895ab350027467ffbe7278740f89ae8be75
Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'

* commit '01eac895ab350027467ffbe7278740f89ae8be75':
  rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess

Conflicts:
libavformat/rtmpproto.c

See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c