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)
commit7c0ab0a3b8e49d0cab3f023e7d9cd49e5d9485be
tree28bd4dfafdacbda62887da0a6551c899fdc0232b
parentc0586b257d9c451747d00ce0d1c5bbdcbe9f4ec5
parent42181740a3972e17d0097d28fabc9a1a60322d47
Merge commit '42181740a3972e17d0097d28fabc9a1a60322d47'

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

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