Merge commit '42181740a3972e17d0097d28fabc9a1a60322d47'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 19:30:07 +0000 (20:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 19:30:12 +0000 (20:30 +0100)
* commit '42181740a3972e17d0097d28fabc9a1a60322d47':
  rtpenc: Set the AVFMT_TS_NONSTRICT flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc.c

Simple merge