aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-28 19:04:42 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-16 00:04:18 +0200
commitfccc37ca85a7c3b0b32075ad7d18588973235517 (patch)
tree26592638b809fceca61d36e7e146a5048b466edf
parent24e52709112e3cf625cf00d3a4c3ae7d0c323d3c (diff)
downloadffmpeg-fccc37ca85a7c3b0b32075ad7d18588973235517.tar.gz
repeat an even number of characters in occured
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpeg4videodec.c2
-rw-r--r--libavformat/matroskadec.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 25f528d59e..055afabc7e 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -3212,7 +3212,7 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
* Decode MPEG-4 headers.
*
* @param header If set the absence of a VOP is not treated as error; otherwise, it is treated as such.
- * @return <0 if an error occured
+ * @return <0 if an error occurred
* FRAME_SKIPPED if a not coded VOP is found
* 0 else
*/
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 8c4ff30935..10c398856b 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -798,7 +798,7 @@ static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
id == MATROSKA_ID_CLUSTER || id == MATROSKA_ID_CHAPTERS) {
/* Prepare the context for parsing of a level 1 element. */
matroska_reset_status(matroska, id, -1);
- /* Given that we are here means that an error has occured,
+ /* Given that we are here means that an error has occurred,
* so treat the segment as unknown length in order not to
* discard valid data that happens to be beyond the designated
* end of the segment. */
@@ -1331,7 +1331,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska,
// current element (i.e. how much would be skipped); if there were
// more than a few skipped elements in a row and skipping the current
// element would lead us more than SKIP_THRESHOLD away from the last
- // known good position, then it is inferred that an error occured.
+ // known good position, then it is inferred that an error occurred.
// The dependency on the number of unknown elements in a row exists
// because the distance to the last known good position is
// automatically big if the last parsed element was big.