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/dvenc.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/dvenc.c')
-rw-r--r-- | libavformat/dvenc.c | 6 |
1 files changed, 3 insertions, 3 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 */ }; |