diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:20 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:34 +0200 |
| commit | 8ef57a0d6154119e1a616dd8c29e8c32e35808a0 (patch) | |
| tree | 26c51bc5d99260b44ba3a2585091ca764559f939 /libavformat/movenc.c | |
| parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
| parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 837e1e5fa3..d4b5dc3931 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2561,7 +2561,7 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov, /* In the positive delay case, the delay includes the cts * offset, and the second edit list entry below trims out * the same amount from the actual content. This makes sure - * that the offsetted last sample is included in the edit + * that the offset last sample is included in the edit * list duration as well. */ if (version == 1) { avio_wb64(pb, delay); @@ -4512,8 +4512,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); } if (par->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1 && !TAG_IS_AVCI(trk->tag)) { - /* from x264 or from bytestream h264 */ - /* nal reformating needed */ + /* from x264 or from bytestream H.264 */ + /* NAL reformatting needed */ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) { ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data, &size); |