[FFmpeg-cvslog] Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 17:03:58 2014 +0200| [afa7ab557a801d54a4c3dbab38350f858efbbd5f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afa7ab557a801d54a4c3dbab38350f858efbbd5f
---