virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-29 00:20:29 +01:00
commit 4dcd1a3145
26 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/APIchanges
View File

@ -22,14 +22,14 @@ API changes, most recent first:
2011-10-20 - b35e9e1 - lavu 51.22.0
Add av_strtok() to avstring.h.
2011-xx-xx - xxxxxxx - lavu 51.18.0
2011-11-23 - bbb46f3 - lavu 51.18.0
Add av_samples_get_buffer_size(), av_samples_fill_arrays(), and
av_samples_alloc(), to samplefmt.h.
2011-xx-xx - xxxxxxx - lavu 51.17.0
2011-11-23 - 8889cc4 - lavu 51.17.0
Add planar sample formats and av_sample_fmt_is_planar() to samplefmt.h.
2011-xx-xx - xxxxxxx - lavc 53.21.0
2011-11-19 - f3a29b7 - lavc 53.21.0
Move some AVCodecContext fields to a new private struct, AVCodecInternal,
which is accessed from a new field, AVCodecContext.internal.
- fields moved:
@ -37,6 +37,9 @@ API changes, most recent first:
AVCodecContext.internal_buffer_count --> AVCodecInternal.buffer_count
AVCodecContext.is_copy --> AVCodecInternal.is_copy
2011-11-16 - 6270671 - lavu 51.16.0
Add av_timegm()
2011-11-13 - lavf 53.15.0
New interrupt callback API, allowing per-AVFormatContext/AVIOContext
interrupt callbacks.
@ -47,9 +50,6 @@ API changes, most recent first:
This will allow passing AVOptions to protocols after lavf
54.0.
2011-11-xx - xxxxxxx - lavu 51.16.0
Add av_timegm()
2011-11-06 - ba04ecf - lavu 51.14.0
Add av_strcasecmp() and av_strncasecmp() to avstring.h.

4
libavcodec/dca.c
View File

@ -519,7 +519,7 @@ static int dca_parse_frame_header(DCAContext * s)
init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8);
/* Sync code */
get_bits(&s->gb, 32);
skip_bits_long(&s->gb, 32);
/* Frame header */
s->frame_type = get_bits(&s->gb, 1);
@ -1257,7 +1257,7 @@ static int dca_subframe_footer(DCAContext * s, int base_channel)
/* presumably optional information only appears in the core? */
if (!base_channel) {
if (s->timestamp)
get_bits(&s->gb, 32);
skip_bits_long(&s->gb, 32);
if (s->aux_data)
aux_data_count = get_bits(&s->gb, 6);

1
libavcodec/dxva2_h264.c
View File

@ -443,7 +443,6 @@ AVHWAccel ff_h264_dxva2_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,
.pix_fmt = PIX_FMT_DXVA2_VLD,
.capabilities = 0,
.start_frame = start_frame,
.decode_slice = decode_slice,
.end_frame = end_frame,

1
libavcodec/dxva2_mpeg2.c
View File

@ -265,7 +265,6 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MPEG2VIDEO,
.pix_fmt = PIX_FMT_DXVA2_VLD,
.capabilities = 0,
.start_frame = start_frame,
.decode_slice = decode_slice,
.end_frame = end_frame,

2
libavcodec/dxva2_vc1.c
View File

@ -269,7 +269,6 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_WMV3,
.pix_fmt = PIX_FMT_DXVA2_VLD,
.capabilities = 0,
.start_frame = start_frame,
.decode_slice = decode_slice,
.end_frame = end_frame,
@ -282,7 +281,6 @@ AVHWAccel ff_vc1_dxva2_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_VC1,
.pix_fmt = PIX_FMT_DXVA2_VLD,
.capabilities = 0,
.start_frame = start_frame,
.decode_slice = decode_slice,
.end_frame = end_frame,

2
libavcodec/indeo3.c
View File

@ -759,7 +759,7 @@ static int parse_bintree(Indeo3DecodeContext *ctx, AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "SkipCell procedure not implemented yet!\n");
CHECK_CELL
if(!curr_cell.mv_ptr)
if (!curr_cell.mv_ptr)
return AVERROR_INVALIDDATA;
copy_cell(ctx, plane, &curr_cell);
return 0;

1
libavcodec/mjpeg2jpeg_bsf.c
View File

@ -108,6 +108,5 @@ static int mjpeg2jpeg_filter(AVBitStreamFilterContext *bsfc,
AVBitStreamFilter ff_mjpeg2jpeg_bsf = {
.name = "mjpeg2jpeg",
.priv_data_size = 0,
.filter = mjpeg2jpeg_filter,
};

1
libavcodec/s302m.c
View File

@ -144,7 +144,6 @@ AVCodec ff_s302m_decoder = {
.name = "s302m",
.type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_S302M,
.priv_data_size = 0,
.decode = s302m_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"),
};

3
libavcodec/txd.c
View File

@ -116,7 +116,8 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
} else if (depth == 16) {
switch (d3d_format) {
case 0:
if (!flags&1) goto unsupported;
if (!(flags & 1))
goto unsupported;
case FF_S3TC_DXT1:
if (buf_end - cur < (w/4) * (h/4) * 8)
return AVERROR_INVALIDDATA;

2
libavcodec/vaapi_h264.c
View File

@ -342,9 +342,7 @@ AVHWAccel ff_h264_vaapi_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = start_frame,
.end_frame = end_frame,
.decode_slice = decode_slice,
.priv_data_size = 0,
};

2
libavcodec/vaapi_mpeg2.c
View File

@ -143,9 +143,7 @@ AVHWAccel ff_mpeg2_vaapi_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MPEG2VIDEO,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_mpeg2_start_frame,
.end_frame = vaapi_mpeg2_end_frame,
.decode_slice = vaapi_mpeg2_decode_slice,
.priv_data_size = 0,
};

4
libavcodec/vaapi_mpeg4.c
View File

@ -155,11 +155,9 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MPEG4,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_mpeg4_start_frame,
.end_frame = vaapi_mpeg4_end_frame,
.decode_slice = vaapi_mpeg4_decode_slice,
.priv_data_size = 0,
};
#endif
@ -169,10 +167,8 @@ AVHWAccel ff_h263_vaapi_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H263,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_mpeg4_start_frame,
.end_frame = vaapi_mpeg4_end_frame,
.decode_slice = vaapi_mpeg4_decode_slice,
.priv_data_size = 0,
};
#endif

4
libavcodec/vaapi_vc1.c
View File

@ -346,11 +346,9 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_WMV3,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_vc1_start_frame,
.end_frame = vaapi_vc1_end_frame,
.decode_slice = vaapi_vc1_decode_slice,
.priv_data_size = 0,
};
#endif
@ -359,9 +357,7 @@ AVHWAccel ff_vc1_vaapi_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_VC1,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_vc1_start_frame,
.end_frame = vaapi_vc1_end_frame,
.decode_slice = vaapi_vc1_decode_slice,
.priv_data_size = 0,
};

1
libavcodec/vda_h264.c
View File

@ -86,7 +86,6 @@ AVHWAccel ff_h264_vda_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,
.pix_fmt = PIX_FMT_VDA_VLD,
.capabilities = 0,
.start_frame = start_frame,
.decode_slice = decode_slice,
.end_frame = end_frame,

1
libavformat/a64.c
View File

@ -166,7 +166,6 @@ static int a64_write_trailer(struct AVFormatContext *s)
AVOutputFormat ff_a64_muxer = {
.name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.mime_type = NULL,
.extensions = "a64, A64",
.priv_data_size = sizeof (A64Context),
.video_codec = CODEC_ID_A64_MULTI,

16
libavformat/adtsenc.c
View File

@ -27,6 +27,8 @@
#include "avformat.h"
#include "adts.h"
#define ADTS_MAX_FRAME_BYTES ((1 << 13) - 1)
int ff_adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)
{
GetBitContext gb;
@ -93,6 +95,13 @@ int ff_adts_write_frame_header(ADTSContext *ctx,
{
PutBitContext pb;
unsigned full_frame_size = (unsigned)ADTS_HEADER_SIZE + size + pce_size;
if (full_frame_size > ADTS_MAX_FRAME_BYTES) {
av_log(NULL, AV_LOG_ERROR, "ADTS frame size too large: %u (max %d)\n",
full_frame_size, ADTS_MAX_FRAME_BYTES);
return AVERROR_INVALIDDATA;
}
init_put_bits(&pb, buf, ADTS_HEADER_SIZE);
/* adts_fixed_header */
@ -110,7 +119,7 @@ int ff_adts_write_frame_header(ADTSContext *ctx,
/* adts_variable_header */
put_bits(&pb, 1, 0); /* copyright_identification_bit */
put_bits(&pb, 1, 0); /* copyright_identification_start */
put_bits(&pb, 13, ADTS_HEADER_SIZE + size + pce_size); /* aac_frame_length */
put_bits(&pb, 13, full_frame_size); /* aac_frame_length */
put_bits(&pb, 11, 0x7ff); /* adts_buffer_fullness */
put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */
@ -128,7 +137,10 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
if (!pkt->size)
return 0;
if (adts->write_adts) {
ff_adts_write_frame_header(adts, buf, pkt->size, adts->pce_size);
int err = ff_adts_write_frame_header(adts, buf, pkt->size,
adts->pce_size);
if (err < 0)
return err;
avio_write(pb, buf, ADTS_HEADER_SIZE);
if (adts->pce_size) {
avio_write(pb, adts->pce_data, adts->pce_size);

1
libavformat/amr.c
View File

@ -176,7 +176,6 @@ static int amr_read_packet(AVFormatContext *s,
AVInputFormat ff_amr_demuxer = {
.name = "amr",
.long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
.priv_data_size = 0, /*priv_data_size*/
.read_probe = amr_probe,
.read_header = amr_read_header,
.read_packet = amr_read_packet,

2
libavformat/md5proto.c
View File

@ -36,7 +36,7 @@ static int md5_open(URLContext *h, const char *filename, int flags)
return -1;
}
if (!flags & AVIO_FLAG_WRITE)
if (!(flags & AVIO_FLAG_WRITE))
return AVERROR(EINVAL);
av_md5_init(h->priv_data);

1
libavformat/mmsh.c
View File

@ -406,7 +406,6 @@ URLProtocol ff_mmsh_protocol = {
.name = "mmsh",
.url_open = mmsh_open,
.url_read = mmsh_read,
.url_write = NULL,
.url_seek = mmsh_seek,
.url_close = mmsh_close,
.url_read_seek = mmsh_read_seek,

1
libavformat/mpeg.c
View File

@ -620,7 +620,6 @@ AVInputFormat ff_mpegps_demuxer = {
.read_probe = mpegps_probe,
.read_header = mpegps_read_header,
.read_packet = mpegps_read_packet,
.read_seek = NULL, //mpegps_read_seek,
.read_timestamp = mpegps_read_dts,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
};

9
libavformat/mpegtsenc.c
View File

@ -1006,7 +1006,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
return -1;
if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) {
ADTSContext *adts = ts_st->adts;
int new_size;
int new_size, err;
if (!adts) {
av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format "
"and extradata missing\n");
@ -1018,7 +1018,12 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
data = av_malloc(new_size);
if (!data)
return AVERROR(ENOMEM);
ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size);
err = ff_adts_write_frame_header(adts, data, pkt->size,
adts->pce_size);
if (err < 0) {
av_free(data);
return err;
}
if (adts->pce_size) {
memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size);
adts->pce_size = 0;

3
libavformat/rsodec.c
View File

@ -92,11 +92,8 @@ AVInputFormat ff_rso_demuxer = {
.name = "rso",
.long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
.extensions = "rso",
.priv_data_size = 0,
.read_probe = NULL, /* no magic value in this format */
.read_header = rso_read_header,
.read_packet = rso_read_packet,
.read_close = NULL,
.read_seek = pcm_read_seek,
.codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
};

1
libavformat/rsoenc.c
View File

@ -104,7 +104,6 @@ AVOutputFormat ff_rso_muxer = {
.name = "rso",
.long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
.extensions = "rso",
.priv_data_size = 0,
.audio_codec = CODEC_ID_PCM_U8,
.video_codec = CODEC_ID_NONE,
.write_header = rso_write_header,

3
libavformat/rtpdec_mpeg4.c
View File

@ -234,9 +234,6 @@ RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = CODEC_ID_MPEG4,
.parse_sdp_a_line = parse_sdp_line,
.alloc = NULL,
.free = NULL,
.parse_packet = NULL
};
RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {

1
libavformat/tls.c
View File

@ -246,7 +246,6 @@ URLProtocol ff_tls_protocol = {
.url_open = tls_open,
.url_read = tls_read,
.url_write = tls_write,
.url_seek = NULL,
.url_close = tls_close,
.priv_data_size = sizeof(TLSContext),
};

2
libavutil/timer.h
View File

@ -61,7 +61,7 @@ tend= AV_READ_TIME();\
}else\
tskip_count++;\
if(((tcount+tskip_count)&(tcount+tskip_count-1))==0){\
av_log(NULL, AV_LOG_ERROR, "%"PRIu64" dezicycles in %s, %d runs, %d skips\n",\
av_log(NULL, AV_LOG_ERROR, "%"PRIu64" decicycles in %s, %d runs, %d skips\n",\
tsum*10/tcount, id, tcount, tskip_count);\
}\
}