summaryrefslogtreecommitdiff
path: root/libavformat/spdifenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:32:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:32:52 +0100
commitd27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch)
treeb43acbce10229c375ac3b21c80a6c2c09354da8d /libavformat/spdifenc.c
parenta41bf09d9c56215448f14fb086c9f882eb41ecac (diff)
parent511cf612ac979f536fd65e14603a87ca5ad435f3 (diff)
downloadffmpeg-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.tar.gz
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/spdifenc.c')
-rw-r--r--libavformat/spdifenc.c2
1 files changed, 1 insertions, 1 deletions
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;
}