Michael Niedermayer afa7ab557a Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251' ...

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-06-20 17:03:58 +02:00

20 KiB

Raw Blame History

View Raw