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/smoothstreamingenc.c | |
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/smoothstreamingenc.c')
-rw-r--r-- | libavformat/smoothstreamingenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |