avio: rename av_alloc_put_byte -> avio_alloc_context for consistency

Anton Khirnov committed 15 years ago

Commit 90ed2771 parent 34bb0575 files · +26 −5Browse files

Unified · Split

5 files

@@ -752,7 +752,7 @@ static int read_gab2_sub(AVStream st, AVPacket pkt) { · 751 unmodified lines
752	752	AVIStream *ast = st->priv_data;
753	753	AVInputFormat *sub_demuxer;
754	754	AVRational time_base;
755		− AVIOContext *pb = av_alloc_put_byte(pkt->data + 7,
	755	+ AVIOContext *pb = avio_alloc_context( pkt->data + 7,
756	756	pkt->size - 7,
757	757	0, NULL, NULL, NULL, NULL);
758	758	AVProbeData pd;

@@ -370,8 +370,17 @@ attribute_deprecated int init_put_byte(AVIOContext *s, · 369 unmodified lines
370	370	int (read_packet)(void opaque, uint8_t *buf, int buf_size),
371	371	int (write_packet)(void opaque, uint8_t *buf, int buf_size),
372	372	int64_t (seek)(void opaque, int64_t offset, int whence));
	373	+attribute_deprecated AVIOContext *av_alloc_put_byte(
	374	+ unsigned char *buffer,
	375	+ int buffer_size,
	376	+ int write_flag,
	377	+ void *opaque,
	378	+ int (read_packet)(void opaque, uint8_t *buf, int buf_size),
	379	+ int (write_packet)(void opaque, uint8_t *buf, int buf_size),
	380	+ int64_t (seek)(void opaque, int64_t offset, int whence));
373	381	#endif
374		−AVIOContext *av_alloc_put_byte(
	382	+
	383	+AVIOContext *avio_alloc_context(
375	384	unsigned char *buffer,
376	385	int buffer_size,
377	386	int write_flag,

@@ -87,9 +87,21 @@ int init_put_byte(AVIOContext *s, · 86 unmodified lines
87	87	return ffio_init_context(s, buffer, buffer_size, write_flag, opaque,
88	88	read_packet, write_packet, seek);
89	89	}
	90	+AVIOContext *av_alloc_put_byte(
	91	+ unsigned char *buffer,
	92	+ int buffer_size,
	93	+ int write_flag,
	94	+ void *opaque,
	95	+ int (read_packet)(void opaque, uint8_t *buf, int buf_size),
	96	+ int (write_packet)(void opaque, uint8_t *buf, int buf_size),
	97	+ int64_t (seek)(void opaque, int64_t offset, int whence))
	98	+{
	99	+ return avio_alloc_context(buffer, buffer_size, write_flag, opaque,
	100	+ read_packet, write_packet, seek);
	101	+}
90	102	#endif
91	103
92		−AVIOContext *av_alloc_put_byte(
	104	+AVIOContext *avio_alloc_context(
93	105	unsigned char *buffer,
94	106	int buffer_size,
95	107	int write_flag,

@@ -311,7 +311,7 @@ rdt_parse_packet (AVFormatContext ctx, PayloadContext rdt, AVStream *st, · 310 unmodified lines
311	311	if (res > 0) {
312	312	if (st->codec->codec_id == CODEC_ID_AAC) {
313	313	memcpy (rdt->buffer, buf + pos, len - pos);
314		− rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0,
	314	+ rdt->rmctx->pb = avio_alloc_context (rdt->buffer, len - pos, 0,
315	315	NULL, NULL, NULL, NULL);
316	316	}
317	317	goto get_cache;

@@ -236,7 +236,7 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int · 235 unmodified lines
236	236	return NULL;
237	237	}
238	238
239		− pb = av_alloc_put_byte(buffer, 1 << wf->sector_bits, 0, wf,
	239	+ pb = avio_alloc_context(buffer, 1 << wf->sector_bits, 0, wf,
240	240	wtvfile_read_packet, NULL, wtvfile_seek);
241	241	if (!pb) {
242	242	av_free(buffer);

Keyboard shortcuts