History

Fix a bunch of common typos.

Diego Biurrun committed 15 years ago

Commit da9cea71 parent 2e87b4c51 files · +83 −82Browse files

Unified · Split

51 files
  1. avconv.c +1 −1
  2. avserver.c +1 −1
  3. cmdutils.h +3 −3
  4. doc/avconv.texi +1 −1
  5. doc/avserver.texi +1 −1
  6. doc/avtools-common-opts.texi +1 −1
  7. doc/developer.texi +2 −2
  8. doc/eval.texi +2 −2
  9. doc/filters.texi +9 −9
  10. doc/general.texi +1 −1
  11. doc/protocols.texi +3 −3
  12. doc/soc.txt +1 −1
  13. ffmpeg.c +1 −1
  14. libavcodec/avcodec.h +2 −2
  15. libavcodec/bitstream.c +1 −1
  16. libavcodec/dsputil.h +2 −2
  17. libavcodec/eatgv.c +2 −2
  18. libavcodec/error_resilience.c +1 −1
  19. libavcodec/g722enc.c +1 −1
  20. libavcodec/h264.c +3 −3
  21. libavcodec/jfdctint_template.c +1 −1
  22. libavcodec/lpc.h +1 −1
  23. libavcodec/mjpegdec.c +3 −3
  24. libavcodec/mpegvideo.h +1 −1
  25. libavcodec/proresdec.c +1 −1
  26. libavcodec/tscc.c +1 −1
  27. libavcodec/vaapi_mpeg4.c +1 −1
  28. libavcodec/vc1dec.c +3 −3
  29. libavcodec/wmaprodec.c +1 −1
  30. libavcodec/wmavoice.c +2 −2
  31. libavcodec/x86/vc1dsp_yasm.asm +1 −1
  32. libavdevice/jack_audio.c +1 −1
  33. libavdevice/timefilter.h +1 −1
  34. libavformat/avformat.h +4 −3
  35. libavformat/flvenc.c +2 −2
  36. libavformat/id3v2.c +1 −1
  37. libavformat/img2.c +1 −1
  38. libavformat/iv8.c +1 −1
  39. libavformat/mms.h +1 −1
  40. libavformat/movenc.c +1 −1
  41. libavformat/mpegts.c +4 −4
  42. libavformat/mpegtsenc.c +1 −1
  43. libavformat/mxfenc.c +1 −1
  44. libavformat/rdt.c +1 −1
  45. libavformat/rtp.h +1 −1
  46. libavformat/udp.c +1 −1
  47. libavformat/utils.c +2 −2
  48. libavutil/eval.h +1 −1
  49. libpostproc/postprocess.c +1 −1
  50. libpostproc/postprocess_internal.h +1 −1
  51. tools/patcheck +1 −1
avconv.c+1−1
@@ -3682,7 +3682,7 @@ static void opt_output_file(void *optctx, const char *filename) · 3681 unmodified lines
3682 }3682 }
3683 3683
3684 if (!(oc->oformat->flags & AVFMT_NOFILE)) {3684 if (!(oc->oformat->flags & AVFMT_NOFILE)) {
3685 /* test if it already exists to avoid loosing precious files */3685 /* test if it already exists to avoid losing precious files */
3686 assert_file_overwrite(filename);3686 assert_file_overwrite(filename);
3687 3687
3688 /* open the file */3688 /* open the file */
avserver.c+1−1
@@ -475,7 +475,7 @@ static void start_children(FFStream *feed) · 474 unmodified lines
475 slash++;475 slash++;
476 strcpy(slash, "avconv");476 strcpy(slash, "avconv");
477 477
478 http_log("Launch commandline: ");478 http_log("Launch command line: ");
479 http_log("%s ", pathname);479 http_log("%s ", pathname);
480 for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++)480 for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++)
481 http_log("%s ", feed->child_argv[i]);481 http_log("%s ", feed->child_argv[i]);
cmdutils.h+3−3
@@ -83,7 +83,7 @@ int opt_timelimit(const char *opt, const char *arg); · 82 unmodified lines
83 * parsed or the corresponding value is invalid.83 * parsed or the corresponding value is invalid.
84 *84 *
85 * @param context the context of the value to be set (e.g. the85 * @param context the context of the value to be set (e.g. the
86 * corresponding commandline option name)86 * corresponding command line option name)
87 * @param numstr the string to be parsed87 * @param numstr the string to be parsed
88 * @param type the type (OPT_INT64 or OPT_FLOAT) as which the88 * @param type the type (OPT_INT64 or OPT_FLOAT) as which the
89 * string should be parsed89 * string should be parsed
@@ -98,7 +98,7 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do · 8 unmodified lines
98 * the string cannot be correctly parsed.98 * the string cannot be correctly parsed.
99 *99 *
100 * @param context the context of the value to be set (e.g. the100 * @param context the context of the value to be set (e.g. the
101 * corresponding commandline option name)101 * corresponding command line option name)
102 * @param timestr the string to be parsed102 * @param timestr the string to be parsed
103 * @param is_duration a flag which tells how to interpret timestr, if103 * @param is_duration a flag which tells how to interpret timestr, if
104 * not zero timestr is interpreted as a duration, otherwise as a104 * not zero timestr is interpreted as a duration, otherwise as a
@@ -181,7 +181,7 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options · 76 unmodified lines
181int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);181int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);
182 182
183/**183/**
184 * Find the '-loglevel' option in the commandline args and apply it.184 * Find the '-loglevel' option in the command line args and apply it.
185 */185 */
186void parse_loglevel(int argc, char **argv, const OptionDef *options);186void parse_loglevel(int argc, char **argv, const OptionDef *options);
187 187
doc/avconv.texi+1−1
@@ -29,7 +29,7 @@ rates and resize video on the fly with a high quality polyphase filter. · 28 unmodified lines
29avconv reads from an arbitrary number of input "files" (which can be regular29avconv reads from an arbitrary number of input "files" (which can be regular
30files, pipes, network streams, grabbing devices, etc.), specified by the30files, pipes, network streams, grabbing devices, etc.), specified by the
31@code{-i} option, and writes to an arbitrary number of output "files", which are31@code{-i} option, and writes to an arbitrary number of output "files", which are
32specified by a plain output filename. Anything found on the commandline which32specified by a plain output filename. Anything found on the command line which
33cannot be interpreted as an option is considered to be an output filename.33cannot be interpreted as an option is considered to be an output filename.
34 34
35Each input or output file can in principle contain any number of streams of35Each input or output file can in principle contain any number of streams of
doc/avserver.texi+1−1
@@ -150,7 +150,7 @@ that only captures in stereo and also requires that one channel be flipped. · 149 unmodified lines
150If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before150If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
151starting avconv.151starting avconv.
152 152
153@subsection The audio and video loose sync after a while.153@subsection The audio and video lose sync after a while.
154 154
155Yes, they do.155Yes, they do.
156 156
doc/avtools-common-opts.texi+1−1
@@ -9,7 +9,7 @@ example 'KB', 'MiB', 'G' and 'B' as postfix. · 8 unmodified lines
9Options which do not take arguments are boolean options, and set the9Options which do not take arguments are boolean options, and set the
10corresponding value to true. They can be set to false by prefixing10corresponding value to true. They can be set to false by prefixing
11with "no" the option name, for example using "-nofoo" in the11with "no" the option name, for example using "-nofoo" in the
12commandline will set to false the boolean option with name "foo".12command line will set to false the boolean option with name "foo".
13 13
14@section Stream specifiers14@section Stream specifiers
15Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers15Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
doc/developer.texi+2−2
@@ -49,7 +49,7 @@ mailing list. · 48 unmodified lines
49The code is written in K&R C style. That means the following:49The code is written in K&R C style. That means the following:
50@itemize @bullet50@itemize @bullet
51@item51@item
52The control statements are formatted by putting space betwen the statement52The control statements are formatted by putting space between the statement
53and parenthesis in the following way:53and parenthesis in the following way:
54@example54@example
55for (i = 0; i < filter->input_count; i++) @{55for (i = 0; i < filter->input_count; i++) @{
@@ -79,7 +79,7 @@ if (!pic || !picref) · 23 unmodified lines
79 goto fail;79 goto fail;
80@end example80@end example
81@item81@item
82Do not put spaces immediately inside parenthesis. @samp{if (ret)} is82Do not put spaces immediately inside parentheses. @samp{if (ret)} is
83a valid style; @samp{if ( ret )} is not.83a valid style; @samp{if ( ret )} is not.
84@end itemize84@end itemize
85 85
doc/eval.texi+2−2
@@ -1,7 +1,7 @@
1@chapter Expression Evaluation1@chapter Expression Evaluation
2@c man begin EXPRESSION EVALUATION2@c man begin EXPRESSION EVALUATION
3 3
4When evaluating an arithemetic expression, Libav uses an internal4When evaluating an arithmetic expression, Libav uses an internal
5formula evaluator, implemented through the @file{libavutil/eval.h}5formula evaluator, implemented through the @file{libavutil/eval.h}
6interface.6interface.
7 7
@@ -53,7 +53,7 @@ returns the value stored in the internal variable. · 45 unmodified lines
53 53
54@item ld(var)54@item ld(var)
55Allow to load the value of the internal variable with number55Allow to load the value of the internal variable with number
56@var{var}, which was previosly stored with st(@var{var}, @var{expr}).56@var{var}, which was previously stored with st(@var{var}, @var{expr}).
57The function returns the loaded value.57The function returns the loaded value.
58 58
59@item while(cond, expr)59@item while(cond, expr)
doc/filters.texi+9−9
@@ -200,7 +200,7 @@ input plane. They are expressions, and can contain the following · 199 unmodified lines
200constants:200constants:
201@table @option201@table @option
202@item w, h202@item w, h
203the input width and heigth in pixels203the input width and height in pixels
204 204
205@item cw, ch205@item cw, ch
206the input chroma image width and height in pixels206the input chroma image width and height in pixels
@@ -888,7 +888,7 @@ the corresponding mathematical approximated values for e · 681 unmodified lines
888(euler number), pi (greek PI), PHI (golden ratio)888(euler number), pi (greek PI), PHI (golden ratio)
889 889
890@item w, h890@item w, h
891the input width and heigth891the input width and height
892 892
893@item val893@item val
894input value for the pixel component894input value for the pixel component
@@ -992,7 +992,7 @@ The filter takes the parameters: @var{filter_name}@{:=@}@var{filter_params}. · 97 unmodified lines
992filter. If not specified the default values are assumed.992filter. If not specified the default values are assumed.
993 993
994Refer to the official libopencv documentation for more precise994Refer to the official libopencv documentation for more precise
995informations:995information:
996@url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}996@url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
997 997
998Follows the list of supported libopencv filters.998Follows the list of supported libopencv filters.
@@ -1008,7 +1008,7 @@ It accepts the parameters: @var{struct_el}:@var{nb_iterations}. · 9 unmodified lines
1008@var{struct_el} represents a structuring element, and has the syntax:1008@var{struct_el} represents a structuring element, and has the syntax:
1009@var{cols}x@var{rows}+@var{anchor_x}x@var{anchor_y}/@var{shape}1009@var{cols}x@var{rows}+@var{anchor_x}x@var{anchor_y}/@var{shape}
1010 1010
1011@var{cols} and @var{rows} represent the number of colums and rows of1011@var{cols} and @var{rows} represent the number of columns and rows of
1012the structuring element, @var{anchor_x} and @var{anchor_y} the anchor1012the structuring element, @var{anchor_x} and @var{anchor_y} the anchor
1013point, and @var{shape} the shape for the structuring element, and1013point, and @var{shape} the shape for the structuring element, and
1014can be one of the values "rect", "cross", "ellipse", "custom".1014can be one of the values "rect", "cross", "ellipse", "custom".
@@ -1184,7 +1184,7 @@ value for @var{width} or @var{height} is 0, the corresponding input size · 169 unmodified lines
1184is used for the output.1184is used for the output.
1185 1185
1186The @var{width} expression can reference the value set by the1186The @var{width} expression can reference the value set by the
1187@var{height} expression, and viceversa.1187@var{height} expression, and vice versa.
1188 1188
1189The default value of @var{width} and @var{height} is 0.1189The default value of @var{width} and @var{height} is 0.
1190 1190
@@ -1194,7 +1194,7 @@ Specify the offsets where to place the input image in the padded area · 3 unmodified lines
1194with respect to the top/left border of the output image.1194with respect to the top/left border of the output image.
1195 1195
1196The @var{x} expression can reference the value set by the @var{y}1196The @var{x} expression can reference the value set by the @var{y}
1197expression, and viceversa.1197expression, and vice versa.
1198 1198
1199The default value of @var{x} and @var{y} is 0.1199The default value of @var{x} and @var{y} is 0.
1200 1200
@@ -1608,7 +1608,7 @@ seconds · 407 unmodified lines
1608 1608
1609@item pos1609@item pos
1610position of the frame in the input stream, -1 if this information in1610position of the frame in the input stream, -1 if this information in
1611unavailable and/or meanigless (for example in case of synthetic video)1611unavailable and/or meaningless (for example in case of synthetic video)
1612 1612
1613@item fmt1613@item fmt
1614pixel format name1614pixel format name
@@ -1825,7 +1825,7 @@ through the interface defined in @file{libavfilter/vsrc_buffer.h}. · 210 unmodified lines
1825It accepts the following parameters:1825It accepts the following parameters:
1826@var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den}1826@var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den}
1827 1827
1828All the parameters need to be explicitely defined.1828All the parameters need to be explicitly defined.
1829 1829
1830Follows the list of the accepted parameters.1830Follows the list of the accepted parameters.
1831 1831
@@ -2017,7 +2017,7 @@ separated by ":". The description of the accepted options follows. · 185 unmodified lines
2017 2017
2018@item size, s2018@item size, s
2019Specify the size of the sourced video, it may be a string of the form2019Specify the size of the sourced video, it may be a string of the form
2020@var{width}x@var{heigth}, or the name of a size abbreviation. The2020@var{width}x@var{height}, or the name of a size abbreviation. The
2021default value is "320x240".2021default value is "320x240".
2022 2022
2023@item rate, r2023@item rate, r
doc/general.texi+1−1
@@ -485,7 +485,7 @@ following image formats are supported: · 484 unmodified lines
485@item id RoQ video @tab X @tab X485@item id RoQ video @tab X @tab X
486 @tab Used in Quake III, Jedi Knight 2, other computer games.486 @tab Used in Quake III, Jedi Knight 2, other computer games.
487@item IFF ILBM @tab @tab X487@item IFF ILBM @tab @tab X
488 @tab IFF interlaved bitmap488 @tab IFF interleaved bitmap
489@item IFF ByteRun1 @tab @tab X489@item IFF ByteRun1 @tab @tab X
490 @tab IFF run length encoded bitmap490 @tab IFF run length encoded bitmap
491@item Intel H.263 @tab @tab X491@item Intel H.263 @tab @tab X
doc/protocols.texi+3−3
@@ -155,8 +155,8 @@ be seekable, so they will fail with the pipe output protocol. · 154 unmodified lines
155 155
156Real-Time Messaging Protocol.156Real-Time Messaging Protocol.
157 157
158The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐158The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
159dia content across a TCP/IP network.159content across a TCP/IP network.
160 160
161The required syntax is:161The required syntax is:
162@example162@example
@@ -195,7 +195,7 @@ Real-Time Messaging Protocol and its variants supported through · 32 unmodified lines
195librtmp.195librtmp.
196 196
197Requires the presence of the librtmp headers and library during197Requires the presence of the librtmp headers and library during
198configuration. You need to explicitely configure the build with198configuration. You need to explicitly configure the build with
199"--enable-librtmp". If enabled this will replace the native RTMP199"--enable-librtmp". If enabled this will replace the native RTMP
200protocol.200protocol.
201 201
doc/soc.txt+1−1
@@ -18,7 +18,7 @@ essential that changes to their codebase are publicly visible, clean and · 17 unmodified lines
18easy reviewable that again leads us to:18easy reviewable that again leads us to:
19* use of a revision control system like git19* use of a revision control system like git
20* separation of cosmetic from non-cosmetic changes (this is almost entirely20* separation of cosmetic from non-cosmetic changes (this is almost entirely
21 ignored by mentors and students in soc 2006 which might lead to a suprise21 ignored by mentors and students in soc 2006 which might lead to a surprise
22 when the code will be reviewed at the end before a possible inclusion in22 when the code will be reviewed at the end before a possible inclusion in
23 Libav, individual changes were generally not reviewable due to cosmetics).23 Libav, individual changes were generally not reviewable due to cosmetics).
24* frequent commits, so that comments can be provided early24* frequent commits, so that comments can be provided early
ffmpeg.c+1−1
@@ -3797,7 +3797,7 @@ static void opt_output_file(void *optctx, const char *filename) · 3796 unmodified lines
3797 }3797 }
3798 3798
3799 if (!(oc->oformat->flags & AVFMT_NOFILE)) {3799 if (!(oc->oformat->flags & AVFMT_NOFILE)) {
3800 /* test if it already exists to avoid loosing precious files */3800 /* test if it already exists to avoid losing precious files */
3801 if (!file_overwrite &&3801 if (!file_overwrite &&
3802 (strchr(filename, ':') == NULL ||3802 (strchr(filename, ':') == NULL ||
3803 filename[1] == ':' ||3803 filename[1] == ':' ||
libavcodec/avcodec.h+2−2
@@ -1274,7 +1274,7 @@ typedef struct AVCodecContext { · 1273 unmodified lines
1274 * Some codecs need additional format info. It is stored here.1274 * Some codecs need additional format info. It is stored here.
1275 * If any muxer uses this then ALL demuxers/parsers AND encoders for the1275 * If any muxer uses this then ALL demuxers/parsers AND encoders for the
1276 * specific codec MUST set it correctly otherwise stream copy breaks.1276 * specific codec MUST set it correctly otherwise stream copy breaks.
1277 * In general use of this field by muxers is not recommanded.1277 * In general use of this field by muxers is not recommended.
1278 * - encoding: Set by libavcodec.1278 * - encoding: Set by libavcodec.
1279 * - decoding: Set by libavcodec. (FIXME: Is this OK?)1279 * - decoding: Set by libavcodec. (FIXME: Is this OK?)
1280 */1280 */
@@ -3444,7 +3444,7 @@ typedef struct ReSampleContext ReSampleContext; · 2163 unmodified lines
3444 * @param linear if 1 then the used FIR filter will be linearly interpolated3444 * @param linear if 1 then the used FIR filter will be linearly interpolated
3445 between the 2 closest, if 0 the closest will be used3445 between the 2 closest, if 0 the closest will be used
3446 * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate3446 * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
3447 * @return allocated ReSampleContext, NULL if error occured3447 * @return allocated ReSampleContext, NULL if error occurred
3448 */3448 */
3449ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,3449ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
3450 int output_rate, int input_rate,3450 int output_rate, int input_rate,
libavcodec/bitstream.c+1−1
@@ -103,7 +103,7 @@ static int alloc_table(VLC *vlc, int size, int use_static) · 102 unmodified lines
103 vlc->table_size += size;103 vlc->table_size += size;
104 if (vlc->table_size > vlc->table_allocated) {104 if (vlc->table_size > vlc->table_allocated) {
105 if(use_static)105 if(use_static)
106 abort(); //cant do anything, init_vlc() is used with too little memory106 abort(); // cannot do anything, init_vlc() is used with too little memory
107 vlc->table_allocated += (1 << vlc->bits);107 vlc->table_allocated += (1 << vlc->bits);
108 vlc->table = av_realloc(vlc->table,108 vlc->table = av_realloc(vlc->table,
109 sizeof(VLC_TYPE) * 2 * vlc->table_allocated);109 sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
libavcodec/dsputil.h+2−2
@@ -498,8 +498,8 @@ typedef struct DSPContext { · 497 unmodified lines
498 * with the zigzag/alternate scan<br>498 * with the zigzag/alternate scan<br>
499 * an example to avoid confusion:499 * an example to avoid confusion:
500 * - (->decode coeffs -> zigzag reorder -> dequant -> reference idct ->...)500 * - (->decode coeffs -> zigzag reorder -> dequant -> reference idct ->...)
501 * - (x -> referece dct -> reference idct -> x)501 * - (x -> reference dct -> reference idct -> x)
502 * - (x -> referece dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)502 * - (x -> reference dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)
503 * - (->decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant -> simple_idct_mmx ->...)503 * - (->decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant -> simple_idct_mmx ->...)
504 */504 */
505 uint8_t idct_permutation[64];505 uint8_t idct_permutation[64];
libavcodec/eatgv.c+2−2
@@ -155,7 +155,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b · 154 unmodified lines
155 vector_bits = AV_RL16(&buf[6]);155 vector_bits = AV_RL16(&buf[6]);
156 buf += 12;156 buf += 12;
157 157
158 /* allocate codebook buffers as neccessary */158 /* allocate codebook buffers as necessary */
159 if (num_mvs > s->num_mvs) {159 if (num_mvs > s->num_mvs) {
160 s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int));160 s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int));
161 s->num_mvs = num_mvs;161 s->num_mvs = num_mvs;
@@ -286,7 +286,7 @@ static int tgv_decode_frame(AVCodecContext *avctx, · 124 unmodified lines
286 s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;286 s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
287 s->frame.linesize[0] = s->width;287 s->frame.linesize[0] = s->width;
288 288
289 /* allocate additional 12 bytes to accomodate av_memcpy_backptr() OUTBUF_PADDED optimisation */289 /* allocate additional 12 bytes to accommodate av_memcpy_backptr() OUTBUF_PADDED optimisation */
290 s->frame.data[0] = av_malloc(s->width*s->height + 12);290 s->frame.data[0] = av_malloc(s->width*s->height + 12);
291 if (!s->frame.data[0])291 if (!s->frame.data[0])
292 return AVERROR(ENOMEM);292 return AVERROR(ENOMEM);
libavcodec/error_resilience.c+1−1
@@ -790,7 +790,7 @@ void ff_er_frame_end(MpegEncContext *s){ · 789 unmodified lines
790 if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||790 if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||
791 s->avctx->hwaccel ||791 s->avctx->hwaccel ||
792 s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||792 s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
793 s->picture_structure != PICT_FRAME || // we dont support ER of field pictures yet, though it should not crash if enabled793 s->picture_structure != PICT_FRAME || // we do not support ER of field pictures yet, though it should not crash if enabled
794 s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;794 s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
795 795
796 if (s->current_picture.f.motion_val[0] == NULL) {796 if (s->current_picture.f.motion_val[0] == NULL) {
libavcodec/g722enc.c+1−1
@@ -153,7 +153,7 @@ static int g722_encode_trellis(AVCodecContext *avctx, · 152 unmodified lines
153 153
154 for (j = 0; j < frontier && nodes[0][j]; j++) {154 for (j = 0; j < frontier && nodes[0][j]; j++) {
155 /* Only k >> 2 affects the future adaptive state, therefore testing155 /* Only k >> 2 affects the future adaptive state, therefore testing
156 * small steps that don't change k >> 2 is useless, the orignal156 * small steps that don't change k >> 2 is useless, the original
157 * value from encode_low is better than them. Since we step k157 * value from encode_low is better than them. Since we step k
158 * in steps of 4, make sure range is a multiple of 4, so that158 * in steps of 4, make sure range is a multiple of 4, so that
159 * we don't miss the original value from encode_low. */159 * we don't miss the original value from encode_low. */
libavcodec/h264.c+3−3
@@ -2893,7 +2893,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ · 2892 unmodified lines
2893 * FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions2893 * FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions
2894 * about there being no actual duplicates.2894 * about there being no actual duplicates.
2895 * FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're2895 * FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're
2896 * concealing a lost frame, this probably isn't noticable by comparison, but it should2896 * concealing a lost frame, this probably isn't noticeable by comparison, but it should
2897 * be fixed. */2897 * be fixed. */
2898 if (h->short_ref_count) {2898 if (h->short_ref_count) {
2899 if (prev) {2899 if (prev) {
@@ -3316,7 +3316,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, MpegEncCon · 416 unmodified lines
3316 3316
3317/**3317/**
3318 *3318 *
3319 * @return non zero if the loop filter can be skiped3319 * @return non zero if the loop filter can be skipped
3320 */3320 */
3321static int fill_filter_caches(H264Context *h, int mb_type){3321static int fill_filter_caches(H264Context *h, int mb_type){
3322 MpegEncContext * const s = &h->s;3322 MpegEncContext * const s = &h->s;
@@ -3839,7 +3839,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ · 516 unmodified lines
3839 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices");3839 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices");
3840 return -1;3840 return -1;
3841 }3841 }
3842 idr(h); //FIXME ensure we don't loose some frames if there is reordering3842 idr(h); // FIXME ensure we don't lose some frames if there is reordering
3843 case NAL_SLICE:3843 case NAL_SLICE:
3844 init_get_bits(&hx->s.gb, ptr, bit_length);3844 init_get_bits(&hx->s.gb, ptr, bit_length);
3845 hx->intra_gb_ptr=3845 hx->intra_gb_ptr=
libavcodec/jfdctint_template.c+1−1
@@ -340,7 +340,7 @@ FUNC(ff_jpeg_fdct_islow)(DCTELEM *data) · 339 unmodified lines
340 340
341/*341/*
342 * The secret of DCT2-4-8 is really simple -- you do the usual 1-DCT342 * The secret of DCT2-4-8 is really simple -- you do the usual 1-DCT
343 * on the rows and then, instead of doing even and odd, part on the colums343 * on the rows and then, instead of doing even and odd, part on the columns
344 * you do even part two times.344 * you do even part two times.
345 */345 */
346GLOBAL(void)346GLOBAL(void)
libavcodec/lpc.h+1−1
@@ -67,7 +67,7 @@ typedef struct LPCContext { · 66 unmodified lines
67 * Perform autocorrelation on input samples with delay of 0 to lag.67 * Perform autocorrelation on input samples with delay of 0 to lag.
68 * @param data input samples.68 * @param data input samples.
69 * constraints: no alignment needed, but must have have at69 * constraints: no alignment needed, but must have have at
70 * least lag*sizeof(double) valid bytes preceeding it, and70 * least lag*sizeof(double) valid bytes preceding it, and
71 * size must be at least (len+1)*sizeof(double) if data is71 * size must be at least (len+1)*sizeof(double) if data is
72 * 16-byte aligned or (len+2)*sizeof(double) if data is72 * 16-byte aligned or (len+2)*sizeof(double) if data is
73 * unaligned.73 * unaligned.
libavcodec/mjpegdec.c+3−3
@@ -1109,9 +1109,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) · 1108 unmodified lines
1109 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);1109 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);
1110 }1110 }
1111 1111
1112 /* buggy AVID, it puts EOI only at every 10th frame */1112 /* Buggy AVID, it puts EOI only at every 10th frame. */
1113 /* also this fourcc is used by non-avid files too, it holds some1113 /* Also, this fourcc is used by non-avid files too, it holds some
1114 informations, but it's always present in AVID creates files */1114 information, but it's always present in AVID-created files. */
1115 if (id == AV_RL32("AVI1"))1115 if (id == AV_RL32("AVI1"))
1116 {1116 {
1117 /* structure:1117 /* structure:
libavcodec/mpegvideo.h+1−1
@@ -127,7 +127,7 @@ typedef struct Picture{ · 126 unmodified lines
127 int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice)127 int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice)
128 int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice)128 int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice)
129 int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF129 int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF
130 int field_picture; ///< whether or not the picture was encoded in seperate fields130 int field_picture; ///< whether or not the picture was encoded in separate fields
131 131
132 int mb_var_sum; ///< sum of MB variance for current frame132 int mb_var_sum; ///< sum of MB variance for current frame
133 int mc_mb_var_sum; ///< motion compensated MB variance for current frame133 int mc_mb_var_sum; ///< motion compensated MB variance for current frame
libavcodec/proresdec.c+1−1
@@ -559,7 +559,7 @@ static int decode_slice(AVCodecContext *avctx, ProresThreadData *td) · 558 unmodified lines
559 sf = sf > 128 ? (sf - 96) << 2 : sf;559 sf = sf > 128 ? (sf - 96) << 2 : sf;
560 560
561 /* scale quantization matrixes according with slice's scale factor */561 /* scale quantization matrixes according with slice's scale factor */
562 /* TODO: this can be SIMD-optimized alot */562 /* TODO: this can be SIMD-optimized a lot */
563 if (ctx->qmat_changed || sf != ctx->prev_slice_sf) {563 if (ctx->qmat_changed || sf != ctx->prev_slice_sf) {
564 ctx->prev_slice_sf = sf;564 ctx->prev_slice_sf = sf;
565 for (i = 0; i < 64; i++) {565 for (i = 0; i < 64; i++) {
libavcodec/tscc.c+1−1
@@ -155,7 +155,7 @@ static av_cold int decode_init(AVCodecContext *avctx) · 154 unmodified lines
155 return -1;155 return -1;
156 }156 }
157 c->bpp = avctx->bits_per_coded_sample;157 c->bpp = avctx->bits_per_coded_sample;
158 // buffer size for RLE 'best' case when 2-byte code preceeds each pixel and there may be padding after it too158 // buffer size for RLE 'best' case when 2-byte code precedes each pixel and there may be padding after it too
159 c->decomp_size = (((avctx->width * c->bpp + 7) >> 3) + 3 * avctx->width + 2) * avctx->height + 2;159 c->decomp_size = (((avctx->width * c->bpp + 7) >> 3) + 3 * avctx->width + 2) * avctx->height + 2;
160 160
161 /* Allocate decompression buffer */161 /* Allocate decompression buffer */
libavcodec/vaapi_mpeg4.c+1−1
@@ -98,7 +98,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ · 97 unmodified lines
98 pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);98 pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
99 99
100 /* Fill in VAIQMatrixBufferMPEG4 */100 /* Fill in VAIQMatrixBufferMPEG4 */
101 /* Only the first inverse quantisation method uses the weighthing matrices */101 /* Only the first inverse quantisation method uses the weighting matrices */
102 if (pic_param->vol_fields.bits.quant_type) {102 if (pic_param->vol_fields.bits.quant_type) {
103 iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG4));103 iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG4));
104 if (!iq_matrix)104 if (!iq_matrix)
libavcodec/vc1dec.c+3−3
@@ -3536,7 +3536,7 @@ static void vc1_apply_p_loop_filter(VC1Context *v) · 3535 unmodified lines
3536 vc1_apply_p_v_loop_filter(v, i);3536 vc1_apply_p_v_loop_filter(v, i);
3537 }3537 }
3538 3538
3539 /* V always preceedes H, therefore we run H one MB before V;3539 /* V always precedes H, therefore we run H one MB before V;
3540 * at the end of a row, we catch up to complete the row */3540 * at the end of a row, we catch up to complete the row */
3541 if (s->mb_x) {3541 if (s->mb_x) {
3542 for (i = 0; i < 6; i++) {3542 for (i = 0; i < 6; i++) {
@@ -3573,7 +3573,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 30 unmodified lines
3573 int skipped, fourmv;3573 int skipped, fourmv;
3574 int block_cbp = 0, pat, block_tt = 0, block_intra = 0;3574 int block_cbp = 0, pat, block_tt = 0, block_intra = 0;
3575 3575
3576 mquant = v->pq; /* Loosy initialization */3576 mquant = v->pq; /* lossy initialization */
3577 3577
3578 if (v->mv_type_is_raw)3578 if (v->mv_type_is_raw)
3579 fourmv = get_bits1(gb);3579 fourmv = get_bits1(gb);
@@ -4141,7 +4141,7 @@ static void vc1_decode_b_mb(VC1Context *v) · 561 unmodified lines
4141 int dmv_x[2], dmv_y[2];4141 int dmv_x[2], dmv_y[2];
4142 int bmvtype = BMV_TYPE_BACKWARD;4142 int bmvtype = BMV_TYPE_BACKWARD;
4143 4143
4144 mquant = v->pq; /* Loosy initialization */4144 mquant = v->pq; /* lossy initialization */
4145 s->mb_intra = 0;4145 s->mb_intra = 0;
4146 4146
4147 if (v->dmb_is_raw)4147 if (v->dmb_is_raw)
libavcodec/wmaprodec.c+1−1
@@ -1425,7 +1425,7 @@ static int remaining_bits(WMAProDecodeCtx *s, GetBitContext *gb) · 1424 unmodified lines
1425 *@param s codec context1425 *@param s codec context
1426 *@param gb bitstream reader context1426 *@param gb bitstream reader context
1427 *@param len length of the partial frame1427 *@param len length of the partial frame
1428 *@param append decides wether to reset the buffer or not1428 *@param append decides whether to reset the buffer or not
1429 */1429 */
1430static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len,1430static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len,
1431 int append)1431 int append)
libavcodec/wmavoice.c+2−2
@@ -189,7 +189,7 @@ typedef struct { · 188 unmodified lines
189 * @{189 * @{
190 */190 */
191 int spillover_nbits; ///< number of bits of the previous packet's191 int spillover_nbits; ///< number of bits of the previous packet's
192 ///< last superframe preceeding this192 ///< last superframe preceding this
193 ///< packet's first full superframe (useful193 ///< packet's first full superframe (useful
194 ///< for re-synchronization also)194 ///< for re-synchronization also)
195 int has_residual_lsps; ///< if set, superframes contain one set of195 int has_residual_lsps; ///< if set, superframes contain one set of
@@ -1805,7 +1805,7 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr) · 1609 unmodified lines
1805 s->frame.nb_samples = n_samples;1805 s->frame.nb_samples = n_samples;
1806 samples = (float *)s->frame.data[0];1806 samples = (float *)s->frame.data[0];
1807 1807
1808 /* Parse frames, optionally preceeded by per-frame (independent) LSPs. */1808 /* Parse frames, optionally preceded by per-frame (independent) LSPs. */
1809 for (n = 0; n < 3; n++) {1809 for (n = 0; n < 3; n++) {
1810 if (!s->has_residual_lsps) {1810 if (!s->has_residual_lsps) {
1811 int m;1811 int m;
libavcodec/x86/vc1dsp_yasm.asm+1−1
@@ -227,7 +227,7 @@ section .text · 226 unmodified lines
227 imul r2, 0x01010101227 imul r2, 0x01010101
228%endmacro228%endmacro
229 229
230; I dont know why the sign extension is needed...230; I do not know why the sign extension is needed...
231%macro PSIGNW_SRA_MMX 2231%macro PSIGNW_SRA_MMX 2
232 psraw %2, 15232 psraw %2, 15
233 PSIGNW_MMX %1, %2233 PSIGNW_MMX %1, %2
libavdevice/jack_audio.c+1−1
@@ -271,7 +271,7 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt) · 270 unmodified lines
271 }271 }
272 }272 }
273 273
274 /* Wait for a packet comming back from process_callback(), if one isn't available yet */274 /* Wait for a packet coming back from process_callback(), if one isn't available yet */
275 timeout.tv_sec = av_gettime() / 1000000 + 2;275 timeout.tv_sec = av_gettime() / 1000000 + 2;
276 if (sem_timedwait(&self->packet_count, &timeout)) {276 if (sem_timedwait(&self->packet_count, &timeout)) {
277 if (errno == ETIMEDOUT) {277 if (errno == ETIMEDOUT) {
libavdevice/timefilter.h+1−1
@@ -72,7 +72,7 @@ TimeFilter * ff_timefilter_new(double clock_period, double feedback2_factor, dou · 71 unmodified lines
72 *72 *
73 * system_time, in seconds, should be the value of the system clock time,73 * system_time, in seconds, should be the value of the system clock time,
74 * at (or as close as possible to) the moment the device hardware interrupt74 * at (or as close as possible to) the moment the device hardware interrupt
75 * occured (or any other event the device clock raises at the beginning of a75 * occurred (or any other event the device clock raises at the beginning of a
76 * cycle).76 * cycle).
77 *77 *
78 * @return the filtered time, in seconds78 * @return the filtered time, in seconds
libavformat/avformat.h+4−3
@@ -685,7 +685,8 @@ typedef struct AVStream { · 684 unmodified lines
685 685
686 /**686 /**
687 * last packet in packet_buffer for this stream when muxing.687 * last packet in packet_buffer for this stream when muxing.
688 * used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav*688 * Used internally, NOT PART OF PUBLIC API, do not read or
689 * write from outside of libav*
689 */690 */
690 struct AVPacketList *last_in_packet_buffer;691 struct AVPacketList *last_in_packet_buffer;
691#endif692#endif
@@ -709,7 +710,7 @@ typedef struct AVStream { · 17 unmodified lines
709 int codec_info_nb_frames;710 int codec_info_nb_frames;
710 711
711 /**712 /**
712 * Stream informations used internally by av_find_stream_info()713 * Stream information used internally by av_find_stream_info()
713 */714 */
714#define MAX_STD_TIMEBASES (60*12+5)715#define MAX_STD_TIMEBASES (60*12+5)
715 struct {716 struct {
@@ -877,7 +878,7 @@ typedef struct AVFormatContext { · 161 unmodified lines
877 /**878 /**
878 * Decoding: duration of the stream, in AV_TIME_BASE fractional879 * Decoding: duration of the stream, in AV_TIME_BASE fractional
879 * seconds. Only set this value if you know none of the individual stream880 * seconds. Only set this value if you know none of the individual stream
880 * durations and also dont set any of them. This is deduced from the881 * durations and also do not set any of them. This is deduced from the
881 * AVStream values if not set.882 * AVStream values if not set.
882 */883 */
883 int64_t duration;884 int64_t duration;
libavformat/flvenc.c+2−2
@@ -361,7 +361,7 @@ static int flv_write_trailer(AVFormatContext *s) · 360 unmodified lines
361 361
362 file_size = avio_tell(pb);362 file_size = avio_tell(pb);
363 363
364 /* update informations */364 /* update information */
365 avio_seek(pb, flv->duration_offset, SEEK_SET);365 avio_seek(pb, flv->duration_offset, SEEK_SET);
366 put_amf_double(pb, flv->duration / (double)1000);366 put_amf_double(pb, flv->duration / (double)1000);
367 avio_seek(pb, flv->filesize_offset, SEEK_SET);367 avio_seek(pb, flv->filesize_offset, SEEK_SET);
@@ -412,7 +412,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) · 44 unmodified lines
412 }412 }
413 413
414 if (enc->codec_id == CODEC_ID_H264) {414 if (enc->codec_id == CODEC_ID_H264) {
415 /* check if extradata looks like mp4 formated */415 /* check if extradata looks like MP4 */
416 if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {416 if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
417 if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)417 if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)
418 return -1;418 return -1;
libavformat/id3v2.c+1−1
@@ -142,7 +142,7 @@ static void free_geobtag(void *obj) · 141 unmodified lines
142 * @param maxread Pointer to maximum number of characters to read from the142 * @param maxread Pointer to maximum number of characters to read from the
143 * AVIOContext. After execution the value is decremented by the number of bytes143 * AVIOContext. After execution the value is decremented by the number of bytes
144 * actually read.144 * actually read.
145 * @returns 0 if no error occured, dst is uninitialized on error145 * @returns 0 if no error occurred, dst is uninitialized on error
146 */146 */
147static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,147static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,
148 uint8_t **dst, int *maxread)148 uint8_t **dst, int *maxread)
libavformat/img2.c+1−1
@@ -432,7 +432,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) · 431 unmodified lines
432 (!st->codec->extradata_size &&432 (!st->codec->extradata_size &&
433 AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature433 AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature
434 error:434 error:
435 av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n");435 av_log(s, AV_LOG_ERROR, "malformed JPEG 2000 codestream\n");
436 return -1;436 return -1;
437 }437 }
438 }438 }
libavformat/iv8.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 24
25static int probe(AVProbeData *p)25static int probe(AVProbeData *p)
26{26{
27 // the single file i have starts with that, i dont know if others do too27 // the single file I have starts with that, I do not know if others do, too
28 if( p->buf[0] == 128 if( p->buf[0] == 1
29 && p->buf[1] == 129 && p->buf[1] == 1
30 && p->buf[2] == 330 && p->buf[2] == 3
libavformat/mms.h+1−1
@@ -33,7 +33,7 @@ typedef struct { · 32 unmodified lines
33 33
34 /** Buffer for outgoing packets. */34 /** Buffer for outgoing packets. */
35 /*@{*/35 /*@{*/
36 uint8_t *write_out_ptr; ///< Pointer for writting the buffer.36 uint8_t *write_out_ptr; ///< Pointer for writing the buffer.
37 uint8_t out_buffer[512]; ///< Buffer for outgoing packet.37 uint8_t out_buffer[512]; ///< Buffer for outgoing packet.
38 /*@}*/38 /*@}*/
39 39
libavformat/movenc.c+1−1
@@ -243,7 +243,7 @@ static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track) · 242 unmodified lines
243 243
244/**244/**
245 * This function writes extradata "as is".245 * This function writes extradata "as is".
246 * Extradata must be formated like a valid atom (with size and tag)246 * Extradata must be formatted like a valid atom (with size and tag).
247 */247 */
248static int mov_write_extradata_tag(AVIOContext *pb, MOVTrack *track)248static int mov_write_extradata_tag(AVIOContext *pb, MOVTrack *track)
249{249{
libavformat/mpegts.c+4−4
@@ -456,7 +456,7 @@ static inline int get16(const uint8_t **pp, const uint8_t *p_end) · 455 unmodified lines
456 return c;456 return c;
457}457}
458 458
459/* read and allocate a DVB string preceeded by its length */459/* read and allocate a DVB string preceded by its length */
460static char *getstr8(const uint8_t **pp, const uint8_t *p_end)460static char *getstr8(const uint8_t **pp, const uint8_t *p_end)
461{461{
462 int len;462 int len;
@@ -1672,7 +1672,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) · 1209 unmodified lines
1672 return 0;1672 return 0;
1673 p = packet + 4;1673 p = packet + 4;
1674 if (has_adaptation) {1674 if (has_adaptation) {
1675 /* skip adapation field */1675 /* skip adaptation field */
1676 p += p[0] + 1;1676 p += p[0] + 1;
1677 }1677 }
1678 /* if past the end of packet, ignore */1678 /* if past the end of packet, ignore */
@@ -1750,7 +1750,7 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size) · 71 unmodified lines
1750 len = avio_read(pb, buf, TS_PACKET_SIZE);1750 len = avio_read(pb, buf, TS_PACKET_SIZE);
1751 if (len != TS_PACKET_SIZE)1751 if (len != TS_PACKET_SIZE)
1752 return len < 0 ? len : AVERROR_EOF;1752 return len < 0 ? len : AVERROR_EOF;
1753 /* check paquet sync byte */1753 /* check packet sync byte */
1754 if (buf[0] != 0x47) {1754 if (buf[0] != 0x47) {
1755 /* find a new packet start */1755 /* find a new packet start */
1756 avio_seek(pb, -TS_PACKET_SIZE, SEEK_CUR);1756 avio_seek(pb, -TS_PACKET_SIZE, SEEK_CUR);
@@ -1892,7 +1892,7 @@ static int mpegts_read_header(AVFormatContext *s, · 135 unmodified lines
1892 if (s->iformat == &ff_mpegts_demuxer) {1892 if (s->iformat == &ff_mpegts_demuxer) {
1893 /* normal demux */1893 /* normal demux */
1894 1894
1895 /* first do a scaning to get all the services */1895 /* first do a scan to get all the services */
1896 if (pb->seekable && avio_seek(pb, pos, SEEK_SET) < 0)1896 if (pb->seekable && avio_seek(pb, pos, SEEK_SET) < 0)
1897 av_log(s, AV_LOG_ERROR, "Unable to seek back to the start\n");1897 av_log(s, AV_LOG_ERROR, "Unable to seek back to the start\n");
1898 1898
libavformat/mpegtsenc.c+1−1
@@ -944,7 +944,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) · 943 unmodified lines
944 uint32_t state = -1;944 uint32_t state = -1;
945 945
946 if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {946 if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
947 av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, "947 av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
948 "no startcode found, use -vbsf h264_mp4toannexb\n");948 "no startcode found, use -vbsf h264_mp4toannexb\n");
949 return -1;949 return -1;
950 }950 }
libavformat/mxfenc.c+1−1
@@ -68,7 +68,7 @@ typedef struct { · 67 unmodified lines
68 int index; ///< index in mxf_essence_container_uls table68 int index; ///< index in mxf_essence_container_uls table
69 const UID *codec_ul;69 const UID *codec_ul;
70 int order; ///< interleaving order if dts are equal70 int order; ///< interleaving order if dts are equal
71 int interlaced; ///< wether picture is interlaced71 int interlaced; ///< whether picture is interlaced
72 int temporal_reordering;72 int temporal_reordering;
73 AVRational aspect_ratio; ///< display aspect ratio73 AVRational aspect_ratio; ///< display aspect ratio
74 int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing74 int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing
libavformat/rdt.c+1−1
@@ -484,7 +484,7 @@ real_parse_asm_rulebook(AVFormatContext *s, AVStream *orig_st, · 483 unmodified lines
484 * is set and once for if it isn't. We only read the first because we484 * is set and once for if it isn't. We only read the first because we
485 * don't care much (that's what the "odd" variable is for).485 * don't care much (that's what the "odd" variable is for).
486 * Each rule contains a set of one or more statements, optionally486 * Each rule contains a set of one or more statements, optionally
487 * preceeded by a single condition. If there's a condition, the rule487 * preceded by a single condition. If there's a condition, the rule
488 * starts with a '#'. Multiple conditions are merged between brackets,488 * starts with a '#'. Multiple conditions are merged between brackets,
489 * so there are never multiple conditions spread out over separate489 * so there are never multiple conditions spread out over separate
490 * statements. Generally, these conditions are bitrate limits (min/max)490 * statements. Generally, these conditions are bitrate limits (min/max)
libavformat/rtp.h+1−1
@@ -72,7 +72,7 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type); · 71 unmodified lines
72#define RTP_VERSION 272#define RTP_VERSION 2
73#define RTP_MAX_SDES 256 /**< maximum text length for SDES */73#define RTP_MAX_SDES 256 /**< maximum text length for SDES */
74 74
75/* RTCP paquets use 0.5 % of the bandwidth */75/* RTCP packets use 0.5% of the bandwidth */
76#define RTCP_TX_RATIO_NUM 576#define RTCP_TX_RATIO_NUM 5
77#define RTCP_TX_RATIO_DEN 100077#define RTCP_TX_RATIO_DEN 1000
78 78
libavformat/udp.c+1−1
@@ -372,7 +372,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) · 371 unmodified lines
372 goto fail;372 goto fail;
373 373
374 /* Follow the requested reuse option, unless it's multicast in which374 /* Follow the requested reuse option, unless it's multicast in which
375 * case enable reuse unless explicitely disabled.375 * case enable reuse unless explicitly disabled.
376 */376 */
377 if (s->reuse_socket || (s->is_multicast && !reuse_specified)) {377 if (s->reuse_socket || (s->is_multicast && !reuse_specified)) {
378 s->reuse_socket = 1;378 s->reuse_socket = 1;
libavformat/utils.c+2−2
@@ -770,7 +770,7 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) · 769 unmodified lines
770 memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);770 memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
771 771
772 if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){772 if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){
773 //FIXME we dont reduce score to 0 for the case of running out of buffer space in bytes773 //FIXME we do not reduce score to 0 for the case of running out of buffer space in bytes
774 set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);774 set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);
775 if(st->codec->codec_id != CODEC_ID_PROBE){775 if(st->codec->codec_id != CODEC_ID_PROBE){
776 pd->buf_size=0;776 pd->buf_size=0;
@@ -1081,7 +1081,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, · 304 unmodified lines
1081 FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);1081 FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
1082 if(pkt->dts == AV_NOPTS_VALUE)1082 if(pkt->dts == AV_NOPTS_VALUE)
1083 pkt->dts= st->pts_buffer[0];1083 pkt->dts= st->pts_buffer[0];
1084 if(st->codec->codec_id == CODEC_ID_H264){ //we skiped it above so we try here1084 if(st->codec->codec_id == CODEC_ID_H264){ // we skipped it above so we try here
1085 update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet1085 update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet
1086 }1086 }
1087 if(pkt->dts > st->cur_dts)1087 if(pkt->dts > st->cur_dts)
libavutil/eval.h+1−1
@@ -58,7 +58,7 @@ int av_expr_parse_and_eval(double *res, const char *s, · 57 unmodified lines
58 * Parse an expression.58 * Parse an expression.
59 *59 *
60 * @param expr a pointer where is put an AVExpr containing the parsed60 * @param expr a pointer where is put an AVExpr containing the parsed
61 * value in case of successfull parsing, or NULL otherwise.61 * value in case of successful parsing, or NULL otherwise.
62 * The pointed to AVExpr must be freed with av_expr_free() by the user62 * The pointed to AVExpr must be freed with av_expr_free() by the user
63 * when it is not needed anymore.63 * when it is not needed anymore.
64 * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"64 * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
libpostproc/postprocess.c+1−1
@@ -909,7 +909,7 @@ static void reallocBuffers(PPContext *c, int width, int height, int stride, int · 908 unmodified lines
909 c->yHistogram[i]= width*height/64*15/256;909 c->yHistogram[i]= width*height/64*15/256;
910 910
911 for(i=0; i<3; i++){911 for(i=0; i<3; i++){
912 //Note: The +17*1024 is just there so i do not have to worry about r/w over the end.912 //Note: The +17*1024 is just there so I do not have to worry about r/w over the end.
913 reallocAlign((void **)&c->tempBlurred[i], 8, stride*mbHeight*16 + 17*1024);913 reallocAlign((void **)&c->tempBlurred[i], 8, stride*mbHeight*16 + 17*1024);
914 reallocAlign((void **)&c->tempBlurredPast[i], 8, 256*((height+7)&(~7))/2 + 17*1024);//FIXME size914 reallocAlign((void **)&c->tempBlurredPast[i], 8, 256*((height+7)&(~7))/2 + 17*1024);//FIXME size
915 }915 }
libpostproc/postprocess_internal.h+1−1
@@ -100,7 +100,7 @@ typedef struct PPMode{ · 99 unmodified lines
100 100
101 int minAllowedY; ///< for brigtness correction101 int minAllowedY; ///< for brigtness correction
102 int maxAllowedY; ///< for brihtness correction102 int maxAllowedY; ///< for brihtness correction
103 float maxClippedThreshold; ///< amount of "black" u r willing to loose to get a brightness corrected picture103 float maxClippedThreshold; ///< amount of "black" you are willing to lose to get a brightness-corrected picture
104 104
105 int maxTmpNoise[3]; ///< for Temporal Noise Reducing filter (Maximal sum of abs differences)105 int maxTmpNoise[3]; ///< for Temporal Noise Reducing filter (Maximal sum of abs differences)
106 106
tools/patcheck+1−1
@@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^ · 66 unmodified lines
67cat $TMP67cat $TMP
68hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*68hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
69 69
70hiegrep '\b(awnser|cant|dont|quantised|quantisation|teh|wont)\b' 'common typos' $*70hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed)\b' 'common typos' $*
71 71
72hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*72hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
73hiegrep '[^sn]printf' 'Please use av_log' $*73hiegrep '[^sn]printf' 'Please use av_log' $*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t