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

Conflicts:
	libavformat/rtmpproto.c

See: 60fd790fMerged-by: Michael Niedermayer <michaelni@gmx.at>