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

Merge commit '86d9181c' 


* commit '86d9181c':
  rtpdec: Support sending RTCP feedback packets

Conflicts:
	libavformat/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8c3ae9ee 86d9181c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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