summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:46:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:46:47 +0100
commitcb03d29dec649efb03b895810f610e61d70800ca (patch)
tree9acc77b1f9a18e4d9e514c1f8428a93bf5adadeb /libavformat/movenc.c
parent0d0a905152f6792901551bf3be39a38b38a36656 (diff)
parent2a1500fb552364488cfbee3e29e296788a3a6bdd (diff)
Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd'
* commit '2a1500fb552364488cfbee3e29e296788a3a6bdd': movenc: Fix a typo in a comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 29b7a2a48b..0143e9b54a 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4161,7 +4161,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (trk->start_dts == AV_NOPTS_VALUE) {
trk->start_dts = pkt->dts;
if (trk->frag_discont) {
- /* Pretend the whole stream started at dts=0, with earlier framgents
+ /* Pretend the whole stream started at dts=0, with earlier fragments
* already written, with a duration summing up to pkt->dts. */
trk->frag_start = pkt->dts;
trk->start_dts = 0;