Skip to content
Snippets Groups Projects
Commit 21ff626c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '01eac895' 


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

Conflicts:
	libavformat/rtmpproto.c

See: 60fd790f
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 900fff89 01eac895
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 29 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment