summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-18 20:30:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-18 20:30:12 +0100
commit7c0ab0a3b8e49d0cab3f023e7d9cd49e5d9485be (patch)
tree28bd4dfafdacbda62887da0a6551c899fdc0232b
parentc0586b257d9c451747d00ce0d1c5bbdcbe9f4ec5 (diff)
parent42181740a3972e17d0097d28fabc9a1a60322d47 (diff)
Merge commit '42181740a3972e17d0097d28fabc9a1a60322d47'
* commit '42181740a3972e17d0097d28fabc9a1a60322d47': rtpenc: Set the AVFMT_TS_NONSTRICT flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtpenc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 43bfc94845..653aeb2922 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -643,4 +643,5 @@ AVOutputFormat ff_rtp_muxer = {
.write_packet = rtp_write_packet,
.write_trailer = rtp_write_trailer,
.priv_class = &rtp_muxer_class,
+ .flags = AVFMT_TS_NONSTRICT,
};