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 /doc/examples/decoding_encoding.c | |
parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
download | ffmpeg-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.tar.gz |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
-rw-r--r-- | doc/examples/decoding_encoding.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 06a98a630e..43a64c2d59 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -25,9 +25,9 @@ * libavcodec API use example. * * @example decoding_encoding.c - * Note that libavcodec only handles codecs (mpeg, mpeg4, etc...), - * not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the - * format handling + * Note that libavcodec only handles codecs (MPEG, MPEG-4, etc...), + * not file formats (AVI, VOB, MP4, MOV, MKV, MXF, FLV, MPEG-TS, MPEG-PS, etc...). + * See library 'libavformat' for the format handling */ #include <math.h> @@ -253,7 +253,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) printf("Decode audio file %s to %s\n", filename, outfilename); - /* find the mpeg audio decoder */ + /* find the MPEG audio decoder */ codec = avcodec_find_decoder(AV_CODEC_ID_MP2); if (!codec) { fprintf(stderr, "Codec not found\n"); @@ -356,7 +356,7 @@ static void video_encode_example(const char *filename, int codec_id) printf("Encode video file %s\n", filename); - /* find the mpeg1 video encoder */ + /* find the video encoder */ codec = avcodec_find_encoder(codec_id); if (!codec) { fprintf(stderr, "Codec not found\n"); @@ -475,7 +475,7 @@ static void video_encode_example(const char *filename, int codec_id) } } - /* add sequence end code to have a real mpeg file */ + /* add sequence end code to have a real MPEG file */ fwrite(endcode, 1, sizeof(endcode), f); fclose(f); @@ -543,12 +543,12 @@ static void video_decode_example(const char *outfilename, const char *filename) av_init_packet(&avpkt); - /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */ + /* set end of buffer to 0 (this ensures that no overreading happens for damaged MPEG streams) */ memset(inbuf + INBUF_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE); printf("Decode video file %s to %s\n", filename, outfilename); - /* find the mpeg1 video decoder */ + /* find the MPEG-1 video decoder */ codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO); if (!codec) { fprintf(stderr, "Codec not found\n"); @@ -613,9 +613,9 @@ static void video_decode_example(const char *outfilename, const char *filename) exit(1); } - /* some codecs, such as MPEG, transmit the I and P frame with a + /* Some codecs, such as MPEG, transmit the I- and P-frame with a latency of one frame. You must do the following to have a - chance to get the last frame of the video */ + chance to get the last frame of the video. */ avpkt.data = NULL; avpkt.size = 0; decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 1); |