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

Merge commit '452860d7' 


* commit '452860d7':
  Use av_packet_rescale_ts() to simplify code.

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4a993335 452860d7
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