diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:32:52 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:32:52 +0400 |
commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /libavformat | |
parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) |
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/dvenc.c | 6 | ||||
-rw-r--r-- | libavformat/rtpdec_jpeg.c | 2 | ||||
-rw-r--r-- | libavformat/smoothstreamingenc.c | 2 | ||||
-rw-r--r-- | libavformat/spdifenc.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index a132edbadf..0841d0e636 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -51,9 +51,9 @@ struct DVMuxContext { AVFifoBuffer *audio_data[2]; /* FIFO for storing excessive amounts of PCM */ int frames; /* current frame number */ int64_t start_time; /* recording start time */ - int has_audio; /* frame under contruction has audio */ - int has_video; /* frame under contruction has video */ - uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under contruction */ + int has_audio; /* frame under construction has audio */ + int has_video; /* frame under construction has video */ + uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */ AVTimecode tc; /* timecode context */ }; diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 447dd361bc..391ae12cb3 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -370,7 +370,7 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, /* Prepare the JPEG packet. */ if ((ret = ff_rtp_finalize_packet(pkt, &jpeg->frame, st->index)) < 0) { av_log(ctx, AV_LOG_ERROR, - "Error occured when getting frame buffer.\n"); + "Error occurred when getting frame buffer.\n"); return ret; } diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index e51d088c48..096bf79c30 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -51,7 +51,7 @@ typedef struct { char dirname[1024]; uint8_t iobuf[32768]; URLContext *out; // Current output stream where all output is written - URLContext *out2; // Auxillary output stream where all output also is written + URLContext *out2; // Auxiliary output stream where all output is also written URLContext *tail_out; // The actual main output stream, if we're currently seeked back to write elsewhere int64_t tail_pos, cur_pos, cur_start_pos; int packets_written; diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index bb0c363e89..cd9a7d4052 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -339,7 +339,7 @@ static int spdif_header_mpeg(AVFormatContext *s, AVPacket *pkt) ctx->data_type = mpeg_data_type [version & 1][layer]; ctx->pkt_offset = spdif_mpeg_pkt_offset[version & 1][layer]; } - // TODO Data type dependant info (normal/karaoke, dynamic range control) + // TODO Data type dependent info (normal/karaoke, dynamic range control) return 0; } |