History

Merge remote-tracking branch 'qatar/master'

* qatar/master: adtsenc: Check frame size. txd: Fix order of operations. APIchanges: fill in some blanks timer: fix misspelling of "decicycles" Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. indeo3: cosmetics md5proto: Fix order of operations. dca: Replace oversized unused get_bits() with skip_bits_long(). Conflicts: doc/APIchanges libavformat/mmsh.c

Michael Niedermayer committed 14 years ago

Commit 4dcd1a32 parents 4b03d96 ac47e0126 files · +34 −47Browse files

Unified · Split

26 files
  1. doc/APIchanges +6 −6
  2. libavcodec/dca.c +2 −2
  3. libavcodec/dxva2_h264.c +0 −1
  4. libavcodec/dxva2_mpeg2.c +0 −1
  5. libavcodec/dxva2_vc1.c +0 −2
  6. libavcodec/indeo3.c +1 −1
  7. libavcodec/mjpeg2jpeg_bsf.c +0 −1
  8. libavcodec/s302m.c +0 −1
  9. libavcodec/txd.c +2 −1
  10. libavcodec/vaapi_h264.c +0 −2
  11. libavcodec/vaapi_mpeg2.c +0 −2
  12. libavcodec/vaapi_mpeg4.c +0 −4
  13. libavcodec/vaapi_vc1.c +0 −4
  14. libavcodec/vda_h264.c +0 −1
  15. libavformat/a64.c +0 −1
  16. libavformat/adtsenc.c +14 −2
  17. libavformat/amr.c +0 −1
  18. libavformat/md5proto.c +1 −1
  19. libavformat/mmsh.c +0 −1
  20. libavformat/mpeg.c +0 −1
  21. libavformat/mpegtsenc.c +7 −2
  22. libavformat/rsodec.c +0 −3
  23. libavformat/rsoenc.c +0 −1
  24. libavformat/rtpdec_mpeg4.c +0 −3
  25. libavformat/tls.c +0 −1
  26. libavutil/timer.h +1 −1
doc/APIchanges+6−6
@@ -22,14 +22,14 @@ API changes, most recent first: · 21 unmodified lines
222011-10-20 - b35e9e1 - lavu 51.22.0222011-10-20 - b35e9e1 - lavu 51.22.0
23 Add av_strtok() to avstring.h.23 Add av_strtok() to avstring.h.
24 24
252011-xx-xx - xxxxxxx - lavu 51.18.0252011-11-23 - bbb46f3 - lavu 51.18.0
26 Add av_samples_get_buffer_size(), av_samples_fill_arrays(), and26 Add av_samples_get_buffer_size(), av_samples_fill_arrays(), and
27 av_samples_alloc(), to samplefmt.h.27 av_samples_alloc(), to samplefmt.h.
28 28
292011-xx-xx - xxxxxxx - lavu 51.17.0292011-11-23 - 8889cc4 - lavu 51.17.0
30 Add planar sample formats and av_sample_fmt_is_planar() to samplefmt.h.30 Add planar sample formats and av_sample_fmt_is_planar() to samplefmt.h.
31 31
322011-xx-xx - xxxxxxx - lavc 53.21.0322011-11-19 - f3a29b7 - lavc 53.21.0
33 Move some AVCodecContext fields to a new private struct, AVCodecInternal,33 Move some AVCodecContext fields to a new private struct, AVCodecInternal,
34 which is accessed from a new field, AVCodecContext.internal.34 which is accessed from a new field, AVCodecContext.internal.
35 - fields moved:35 - fields moved:
@@ -37,6 +37,9 @@ API changes, most recent first: · 1 unmodified line
37 AVCodecContext.internal_buffer_count --> AVCodecInternal.buffer_count37 AVCodecContext.internal_buffer_count --> AVCodecInternal.buffer_count
38 AVCodecContext.is_copy --> AVCodecInternal.is_copy38 AVCodecContext.is_copy --> AVCodecInternal.is_copy
39 39
402011-11-16 - 6270671 - lavu 51.16.0
41 Add av_timegm()
42
402011-11-13 - lavf 53.15.0432011-11-13 - lavf 53.15.0
41 New interrupt callback API, allowing per-AVFormatContext/AVIOContext44 New interrupt callback API, allowing per-AVFormatContext/AVIOContext
42 interrupt callbacks.45 interrupt callbacks.
@@ -47,9 +50,6 @@ API changes, most recent first: · 4 unmodified lines
47 This will allow passing AVOptions to protocols after lavf50 This will allow passing AVOptions to protocols after lavf
48 54.0.51 54.0.
49 52
502011-11-xx - xxxxxxx - lavu 51.16.0
51 Add av_timegm()
52
532011-11-06 - ba04ecf - lavu 51.14.0532011-11-06 - ba04ecf - lavu 51.14.0
54 Add av_strcasecmp() and av_strncasecmp() to avstring.h.54 Add av_strcasecmp() and av_strncasecmp() to avstring.h.
55 55
libavcodec/dca.c+2−2
@@ -519,7 +519,7 @@ static int dca_parse_frame_header(DCAContext * s) · 518 unmodified lines
519 init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8);519 init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8);
520 520
521 /* Sync code */521 /* Sync code */
522 get_bits(&s->gb, 32);522 skip_bits_long(&s->gb, 32);
523 523
524 /* Frame header */524 /* Frame header */
525 s->frame_type = get_bits(&s->gb, 1);525 s->frame_type = get_bits(&s->gb, 1);
@@ -1257,7 +1257,7 @@ static int dca_subframe_footer(DCAContext * s, int base_channel) · 731 unmodified lines
1257 /* presumably optional information only appears in the core? */1257 /* presumably optional information only appears in the core? */
1258 if (!base_channel) {1258 if (!base_channel) {
1259 if (s->timestamp)1259 if (s->timestamp)
1260 get_bits(&s->gb, 32);1260 skip_bits_long(&s->gb, 32);
1261 1261
1262 if (s->aux_data)1262 if (s->aux_data)
1263 aux_data_count = get_bits(&s->gb, 6);1263 aux_data_count = get_bits(&s->gb, 6);
libavcodec/dxva2_h264.c+0−1
@@ -443,7 +443,6 @@ AVHWAccel ff_h264_dxva2_hwaccel = { · 442 unmodified lines
443 .type = AVMEDIA_TYPE_VIDEO,443 .type = AVMEDIA_TYPE_VIDEO,
444 .id = CODEC_ID_H264,444 .id = CODEC_ID_H264,
445 .pix_fmt = PIX_FMT_DXVA2_VLD,445 .pix_fmt = PIX_FMT_DXVA2_VLD,
446 .capabilities = 0,
447 .start_frame = start_frame,446 .start_frame = start_frame,
448 .decode_slice = decode_slice,447 .decode_slice = decode_slice,
449 .end_frame = end_frame,448 .end_frame = end_frame,
libavcodec/dxva2_mpeg2.c+0−1
@@ -265,7 +265,6 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = { · 264 unmodified lines
265 .type = AVMEDIA_TYPE_VIDEO,265 .type = AVMEDIA_TYPE_VIDEO,
266 .id = CODEC_ID_MPEG2VIDEO,266 .id = CODEC_ID_MPEG2VIDEO,
267 .pix_fmt = PIX_FMT_DXVA2_VLD,267 .pix_fmt = PIX_FMT_DXVA2_VLD,
268 .capabilities = 0,
269 .start_frame = start_frame,268 .start_frame = start_frame,
270 .decode_slice = decode_slice,269 .decode_slice = decode_slice,
271 .end_frame = end_frame,270 .end_frame = end_frame,
libavcodec/dxva2_vc1.c+0−2
@@ -269,7 +269,6 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = { · 268 unmodified lines
269 .type = AVMEDIA_TYPE_VIDEO,269 .type = AVMEDIA_TYPE_VIDEO,
270 .id = CODEC_ID_WMV3,270 .id = CODEC_ID_WMV3,
271 .pix_fmt = PIX_FMT_DXVA2_VLD,271 .pix_fmt = PIX_FMT_DXVA2_VLD,
272 .capabilities = 0,
273 .start_frame = start_frame,272 .start_frame = start_frame,
274 .decode_slice = decode_slice,273 .decode_slice = decode_slice,
275 .end_frame = end_frame,274 .end_frame = end_frame,
@@ -282,7 +281,6 @@ AVHWAccel ff_vc1_dxva2_hwaccel = { · 6 unmodified lines
282 .type = AVMEDIA_TYPE_VIDEO,281 .type = AVMEDIA_TYPE_VIDEO,
283 .id = CODEC_ID_VC1,282 .id = CODEC_ID_VC1,
284 .pix_fmt = PIX_FMT_DXVA2_VLD,283 .pix_fmt = PIX_FMT_DXVA2_VLD,
285 .capabilities = 0,
286 .start_frame = start_frame,284 .start_frame = start_frame,
287 .decode_slice = decode_slice,285 .decode_slice = decode_slice,
288 .end_frame = end_frame,286 .end_frame = end_frame,
libavcodec/indeo3.c+1−1
@@ -759,7 +759,7 @@ static int parse_bintree(Indeo3DecodeContext *ctx, AVCodecContext *avctx, · 758 unmodified lines
759 av_log(avctx, AV_LOG_ERROR, "SkipCell procedure not implemented yet!\n");759 av_log(avctx, AV_LOG_ERROR, "SkipCell procedure not implemented yet!\n");
760 760
761 CHECK_CELL761 CHECK_CELL
762 if(!curr_cell.mv_ptr)762 if (!curr_cell.mv_ptr)
763 return AVERROR_INVALIDDATA;763 return AVERROR_INVALIDDATA;
764 copy_cell(ctx, plane, &curr_cell);764 copy_cell(ctx, plane, &curr_cell);
765 return 0;765 return 0;
libavcodec/mjpeg2jpeg_bsf.c+0−1
@@ -108,6 +108,5 @@ static int mjpeg2jpeg_filter(AVBitStreamFilterContext *bsfc, · 107 unmodified lines
108 108
109AVBitStreamFilter ff_mjpeg2jpeg_bsf = {109AVBitStreamFilter ff_mjpeg2jpeg_bsf = {
110 .name = "mjpeg2jpeg",110 .name = "mjpeg2jpeg",
111 .priv_data_size = 0,
112 .filter = mjpeg2jpeg_filter,111 .filter = mjpeg2jpeg_filter,
113};112};
libavcodec/s302m.c+0−1
@@ -144,7 +144,6 @@ AVCodec ff_s302m_decoder = { · 143 unmodified lines
144 .name = "s302m",144 .name = "s302m",
145 .type = AVMEDIA_TYPE_AUDIO,145 .type = AVMEDIA_TYPE_AUDIO,
146 .id = CODEC_ID_S302M,146 .id = CODEC_ID_S302M,
147 .priv_data_size = 0,
148 .decode = s302m_decode_frame,147 .decode = s302m_decode_frame,
149 .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"),148 .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"),
150};149};
libavcodec/txd.c+2−1
@@ -116,7 +116,8 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, · 115 unmodified lines
116 } else if (depth == 16) {116 } else if (depth == 16) {
117 switch (d3d_format) {117 switch (d3d_format) {
118 case 0:118 case 0:
119 if (!flags&1) goto unsupported;119 if (!(flags & 1))
120 goto unsupported;
120 case FF_S3TC_DXT1:121 case FF_S3TC_DXT1:
121 if (buf_end - cur < (w/4) * (h/4) * 8)122 if (buf_end - cur < (w/4) * (h/4) * 8)
122 return AVERROR_INVALIDDATA;123 return AVERROR_INVALIDDATA;
libavcodec/vaapi_h264.c+0−2
@@ -342,9 +342,7 @@ AVHWAccel ff_h264_vaapi_hwaccel = { · 341 unmodified lines
342 .type = AVMEDIA_TYPE_VIDEO,342 .type = AVMEDIA_TYPE_VIDEO,
343 .id = CODEC_ID_H264,343 .id = CODEC_ID_H264,
344 .pix_fmt = PIX_FMT_VAAPI_VLD,344 .pix_fmt = PIX_FMT_VAAPI_VLD,
345 .capabilities = 0,
346 .start_frame = start_frame,345 .start_frame = start_frame,
347 .end_frame = end_frame,346 .end_frame = end_frame,
348 .decode_slice = decode_slice,347 .decode_slice = decode_slice,
349 .priv_data_size = 0,
350};348};
libavcodec/vaapi_mpeg2.c+0−2
@@ -143,9 +143,7 @@ AVHWAccel ff_mpeg2_vaapi_hwaccel = { · 142 unmodified lines
143 .type = AVMEDIA_TYPE_VIDEO,143 .type = AVMEDIA_TYPE_VIDEO,
144 .id = CODEC_ID_MPEG2VIDEO,144 .id = CODEC_ID_MPEG2VIDEO,
145 .pix_fmt = PIX_FMT_VAAPI_VLD,145 .pix_fmt = PIX_FMT_VAAPI_VLD,
146 .capabilities = 0,
147 .start_frame = vaapi_mpeg2_start_frame,146 .start_frame = vaapi_mpeg2_start_frame,
148 .end_frame = vaapi_mpeg2_end_frame,147 .end_frame = vaapi_mpeg2_end_frame,
149 .decode_slice = vaapi_mpeg2_decode_slice,148 .decode_slice = vaapi_mpeg2_decode_slice,
150 .priv_data_size = 0,
151};149};
libavcodec/vaapi_mpeg4.c+0−4
@@ -155,11 +155,9 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = { · 154 unmodified lines
155 .type = AVMEDIA_TYPE_VIDEO,155 .type = AVMEDIA_TYPE_VIDEO,
156 .id = CODEC_ID_MPEG4,156 .id = CODEC_ID_MPEG4,
157 .pix_fmt = PIX_FMT_VAAPI_VLD,157 .pix_fmt = PIX_FMT_VAAPI_VLD,
158 .capabilities = 0,
159 .start_frame = vaapi_mpeg4_start_frame,158 .start_frame = vaapi_mpeg4_start_frame,
160 .end_frame = vaapi_mpeg4_end_frame,159 .end_frame = vaapi_mpeg4_end_frame,
161 .decode_slice = vaapi_mpeg4_decode_slice,160 .decode_slice = vaapi_mpeg4_decode_slice,
162 .priv_data_size = 0,
163};161};
164#endif162#endif
165 163
@@ -169,10 +167,8 @@ AVHWAccel ff_h263_vaapi_hwaccel = { · 3 unmodified lines
169 .type = AVMEDIA_TYPE_VIDEO,167 .type = AVMEDIA_TYPE_VIDEO,
170 .id = CODEC_ID_H263,168 .id = CODEC_ID_H263,
171 .pix_fmt = PIX_FMT_VAAPI_VLD,169 .pix_fmt = PIX_FMT_VAAPI_VLD,
172 .capabilities = 0,
173 .start_frame = vaapi_mpeg4_start_frame,170 .start_frame = vaapi_mpeg4_start_frame,
174 .end_frame = vaapi_mpeg4_end_frame,171 .end_frame = vaapi_mpeg4_end_frame,
175 .decode_slice = vaapi_mpeg4_decode_slice,172 .decode_slice = vaapi_mpeg4_decode_slice,
176 .priv_data_size = 0,
177};173};
178#endif174#endif
libavcodec/vaapi_vc1.c+0−4
@@ -346,11 +346,9 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = { · 345 unmodified lines
346 .type = AVMEDIA_TYPE_VIDEO,346 .type = AVMEDIA_TYPE_VIDEO,
347 .id = CODEC_ID_WMV3,347 .id = CODEC_ID_WMV3,
348 .pix_fmt = PIX_FMT_VAAPI_VLD,348 .pix_fmt = PIX_FMT_VAAPI_VLD,
349 .capabilities = 0,
350 .start_frame = vaapi_vc1_start_frame,349 .start_frame = vaapi_vc1_start_frame,
351 .end_frame = vaapi_vc1_end_frame,350 .end_frame = vaapi_vc1_end_frame,
352 .decode_slice = vaapi_vc1_decode_slice,351 .decode_slice = vaapi_vc1_decode_slice,
353 .priv_data_size = 0,
354};352};
355#endif353#endif
356 354
@@ -359,9 +357,7 @@ AVHWAccel ff_vc1_vaapi_hwaccel = { · 2 unmodified lines
359 .type = AVMEDIA_TYPE_VIDEO,357 .type = AVMEDIA_TYPE_VIDEO,
360 .id = CODEC_ID_VC1,358 .id = CODEC_ID_VC1,
361 .pix_fmt = PIX_FMT_VAAPI_VLD,359 .pix_fmt = PIX_FMT_VAAPI_VLD,
362 .capabilities = 0,
363 .start_frame = vaapi_vc1_start_frame,360 .start_frame = vaapi_vc1_start_frame,
364 .end_frame = vaapi_vc1_end_frame,361 .end_frame = vaapi_vc1_end_frame,
365 .decode_slice = vaapi_vc1_decode_slice,362 .decode_slice = vaapi_vc1_decode_slice,
366 .priv_data_size = 0,
367};363};
libavcodec/vda_h264.c+0−1
@@ -86,7 +86,6 @@ AVHWAccel ff_h264_vda_hwaccel = { · 85 unmodified lines
86 .type = AVMEDIA_TYPE_VIDEO,86 .type = AVMEDIA_TYPE_VIDEO,
87 .id = CODEC_ID_H264,87 .id = CODEC_ID_H264,
88 .pix_fmt = PIX_FMT_VDA_VLD,88 .pix_fmt = PIX_FMT_VDA_VLD,
89 .capabilities = 0,
90 .start_frame = start_frame,89 .start_frame = start_frame,
91 .decode_slice = decode_slice,90 .decode_slice = decode_slice,
92 .end_frame = end_frame,91 .end_frame = end_frame,
libavformat/a64.c+0−1
@@ -166,7 +166,6 @@ static int a64_write_trailer(struct AVFormatContext *s) · 165 unmodified lines
166AVOutputFormat ff_a64_muxer = {166AVOutputFormat ff_a64_muxer = {
167 .name = "a64",167 .name = "a64",
168 .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),168 .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
169 .mime_type = NULL,
170 .extensions = "a64, A64",169 .extensions = "a64, A64",
171 .priv_data_size = sizeof (A64Context),170 .priv_data_size = sizeof (A64Context),
172 .video_codec = CODEC_ID_A64_MULTI,171 .video_codec = CODEC_ID_A64_MULTI,
libavformat/adtsenc.c+14−2
@@ -27,6 +27,8 @@ · 26 unmodified lines
27#include "avformat.h"27#include "avformat.h"
28#include "adts.h"28#include "adts.h"
29 29
30#define ADTS_MAX_FRAME_BYTES ((1 << 13) - 1)
31
30int ff_adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)32int ff_adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)
31{33{
32 GetBitContext gb;34 GetBitContext gb;
@@ -93,6 +95,13 @@ int ff_adts_write_frame_header(ADTSContext *ctx, · 60 unmodified lines
93{95{
94 PutBitContext pb;96 PutBitContext pb;
95 97
98 unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size;
99 if (full_frame_size > ADTS_MAX_FRAME_BYTES) {
100 av_log(NULL, AV_LOG_ERROR, "ADTS frame size too large: %u (max %d)\n",
101 full_frame_size, ADTS_MAX_FRAME_BYTES);
102 return AVERROR_INVALIDDATA;
103 }
104
96 init_put_bits(&pb, buf, ADTS_HEADER_SIZE);105 init_put_bits(&pb, buf, ADTS_HEADER_SIZE);
97 106
98 /* adts_fixed_header */107 /* adts_fixed_header */
@@ -110,7 +119,7 @@ int ff_adts_write_frame_header(ADTSContext *ctx, · 11 unmodified lines
110 /* adts_variable_header */119 /* adts_variable_header */
111 put_bits(&pb, 1, 0); /* copyright_identification_bit */120 put_bits(&pb, 1, 0); /* copyright_identification_bit */
112 put_bits(&pb, 1, 0); /* copyright_identification_start */121 put_bits(&pb, 1, 0); /* copyright_identification_start */
113 put_bits(&pb, 13, ADTS_HEADER_SIZE + size + pce_size); /* aac_frame_length */122 put_bits(&pb, 13, full_frame_size); /* aac_frame_length */
114 put_bits(&pb, 11, 0x7ff); /* adts_buffer_fullness */123 put_bits(&pb, 11, 0x7ff); /* adts_buffer_fullness */
115 put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */124 put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */
116 125
@@ -128,7 +137,10 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) · 11 unmodified lines
128 if (!pkt->size)137 if (!pkt->size)
129 return 0;138 return 0;
130 if (adts->write_adts) {139 if (adts->write_adts) {
131 ff_adts_write_frame_header(adts, buf, pkt->size, adts->pce_size);140 int err = ff_adts_write_frame_header(adts, buf, pkt->size,
141 adts->pce_size);
142 if (err < 0)
143 return err;
132 avio_write(pb, buf, ADTS_HEADER_SIZE);144 avio_write(pb, buf, ADTS_HEADER_SIZE);
133 if (adts->pce_size) {145 if (adts->pce_size) {
134 avio_write(pb, adts->pce_data, adts->pce_size);146 avio_write(pb, adts->pce_data, adts->pce_size);
libavformat/amr.c+0−1
@@ -176,7 +176,6 @@ static int amr_read_packet(AVFormatContext *s, · 175 unmodified lines
176AVInputFormat ff_amr_demuxer = {176AVInputFormat ff_amr_demuxer = {
177 .name = "amr",177 .name = "amr",
178 .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"),178 .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
179 .priv_data_size = 0, /*priv_data_size*/
180 .read_probe = amr_probe,179 .read_probe = amr_probe,
181 .read_header = amr_read_header,180 .read_header = amr_read_header,
182 .read_packet = amr_read_packet,181 .read_packet = amr_read_packet,
libavformat/md5proto.c+1−1
@@ -36,7 +36,7 @@ static int md5_open(URLContext *h, const char *filename, int flags) · 35 unmodified lines
36 return -1;36 return -1;
37 }37 }
38 38
39 if (!flags & AVIO_FLAG_WRITE)39 if (!(flags & AVIO_FLAG_WRITE))
40 return AVERROR(EINVAL);40 return AVERROR(EINVAL);
41 41
42 av_md5_init(h->priv_data);42 av_md5_init(h->priv_data);
libavformat/mmsh.c+0−1
@@ -406,7 +406,6 @@ URLProtocol ff_mmsh_protocol = { · 405 unmodified lines
406 .name = "mmsh",406 .name = "mmsh",
407 .url_open = mmsh_open,407 .url_open = mmsh_open,
408 .url_read = mmsh_read,408 .url_read = mmsh_read,
409 .url_write = NULL,
410 .url_seek = mmsh_seek,409 .url_seek = mmsh_seek,
411 .url_close = mmsh_close,410 .url_close = mmsh_close,
412 .url_read_seek = mmsh_read_seek,411 .url_read_seek = mmsh_read_seek,
libavformat/mpeg.c+0−1
@@ -620,7 +620,6 @@ AVInputFormat ff_mpegps_demuxer = { · 619 unmodified lines
620 .read_probe = mpegps_probe,620 .read_probe = mpegps_probe,
621 .read_header = mpegps_read_header,621 .read_header = mpegps_read_header,
622 .read_packet = mpegps_read_packet,622 .read_packet = mpegps_read_packet,
623 .read_seek = NULL, //mpegps_read_seek,
624 .read_timestamp = mpegps_read_dts,623 .read_timestamp = mpegps_read_dts,
625 .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,624 .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
626};625};
libavformat/mpegtsenc.c+7−2
@@ -1006,7 +1006,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) · 1005 unmodified lines
1006 return -1;1006 return -1;
1007 if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) {1007 if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) {
1008 ADTSContext *adts = ts_st->adts;1008 ADTSContext *adts = ts_st->adts;
1009 int new_size;1009 int new_size, err;
1010 if (!adts) {1010 if (!adts) {
1011 av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format "1011 av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format "
1012 "and extradata missing\n");1012 "and extradata missing\n");
@@ -1018,7 +1018,12 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) · 5 unmodified lines
1018 data = av_malloc(new_size);1018 data = av_malloc(new_size);
1019 if (!data)1019 if (!data)
1020 return AVERROR(ENOMEM);1020 return AVERROR(ENOMEM);
1021 ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size);1021 err = ff_adts_write_frame_header(adts, data, pkt->size,
1022 adts->pce_size);
1023 if (err < 0) {
1024 av_free(data);
1025 return err;
1026 }
1022 if (adts->pce_size) {1027 if (adts->pce_size) {
1023 memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size);1028 memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size);
1024 adts->pce_size = 0;1029 adts->pce_size = 0;
libavformat/rsodec.c+0−3
@@ -92,11 +92,8 @@ AVInputFormat ff_rso_demuxer = { · 91 unmodified lines
92 .name = "rso",92 .name = "rso",
93 .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),93 .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
94 .extensions = "rso",94 .extensions = "rso",
95 .priv_data_size = 0,
96 .read_probe = NULL, /* no magic value in this format */
97 .read_header = rso_read_header,95 .read_header = rso_read_header,
98 .read_packet = rso_read_packet,96 .read_packet = rso_read_packet,
99 .read_close = NULL,
100 .read_seek = pcm_read_seek,97 .read_seek = pcm_read_seek,
101 .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},98 .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
102};99};
libavformat/rsoenc.c+0−1
@@ -104,7 +104,6 @@ AVOutputFormat ff_rso_muxer = { · 103 unmodified lines
104 .name = "rso",104 .name = "rso",
105 .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),105 .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
106 .extensions = "rso",106 .extensions = "rso",
107 .priv_data_size = 0,
108 .audio_codec = CODEC_ID_PCM_U8,107 .audio_codec = CODEC_ID_PCM_U8,
109 .video_codec = CODEC_ID_NONE,108 .video_codec = CODEC_ID_NONE,
110 .write_header = rso_write_header,109 .write_header = rso_write_header,
libavformat/rtpdec_mpeg4.c+0−3
@@ -234,9 +234,6 @@ RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = { · 233 unmodified lines
234 .codec_type = AVMEDIA_TYPE_VIDEO,234 .codec_type = AVMEDIA_TYPE_VIDEO,
235 .codec_id = CODEC_ID_MPEG4,235 .codec_id = CODEC_ID_MPEG4,
236 .parse_sdp_a_line = parse_sdp_line,236 .parse_sdp_a_line = parse_sdp_line,
237 .alloc = NULL,
238 .free = NULL,
239 .parse_packet = NULL
240};237};
241 238
242RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {239RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
libavformat/tls.c+0−1
@@ -246,7 +246,6 @@ URLProtocol ff_tls_protocol = { · 245 unmodified lines
246 .url_open = tls_open,246 .url_open = tls_open,
247 .url_read = tls_read,247 .url_read = tls_read,
248 .url_write = tls_write,248 .url_write = tls_write,
249 .url_seek = NULL,
250 .url_close = tls_close,249 .url_close = tls_close,
251 .priv_data_size = sizeof(TLSContext),250 .priv_data_size = sizeof(TLSContext),
252};251};
libavutil/timer.h+1−1
@@ -61,7 +61,7 @@ tend= AV_READ_TIME();\ · 60 unmodified lines
61 }else\61 }else\
62 tskip_count++;\62 tskip_count++;\
63 if(((tcount+tskip_count)&(tcount+tskip_count-1))==0){\63 if(((tcount+tskip_count)&(tcount+tskip_count-1))==0){\
64 av_log(NULL, AV_LOG_ERROR, "%"PRIu64" dezicycles in %s, %d runs, %d skips\n",\64 av_log(NULL, AV_LOG_ERROR, "%"PRIu64" decicycles in %s, %d runs, %d skips\n",\
65 tsum*10/tcount, id, tcount, tskip_count);\65 tsum*10/tcount, id, tcount, tskip_count);\
66 }\66 }\
67}67}

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