[FFmpeg-cvslog] Merge commit '42181740a3972e17d0097d28fabc9a1a60322d47'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 18 20:30:07 2014 +0100| [7c0ab0a3b8e49d0cab3f023e7d9cd49e5d9485be] | committer: Michael Niedermayer

Merge commit '42181740a3972e17d0097d28fabc9a1a60322d47'

* commit '42181740a3972e17d0097d28fabc9a1a60322d47':
  rtpenc: Set the AVFMT_TS_NONSTRICT flag

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

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