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

Merge commit '38d04442' 


* commit '38d04442':
  output example: use the new AVFrame API for allocating the video frame

Conflicts:
	doc/examples/muxing.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents af75a855 38d04442
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 33 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