Revision 0ac8e2bf

View differences:

libavformat/avio.h
397 397
attribute_deprecated uint64_t     get_be64(AVIOContext *s);
398 398

  
399 399
attribute_deprecated void         put_byte(AVIOContext *s, int b);
400
attribute_deprecated void         put_nbyte(AVIOContext *s, int b, int count);
400 401
attribute_deprecated void         put_buffer(AVIOContext *s, const unsigned char *buf, int size);
401 402
attribute_deprecated void         put_le64(AVIOContext *s, uint64_t val);
402 403
attribute_deprecated void         put_be64(AVIOContext *s, uint64_t val);
......
421 422
                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
422 423

  
423 424
void avio_w8(AVIOContext *s, int b);
424
void put_nbyte(AVIOContext *s, int b, int count);
425 425
void avio_write(AVIOContext *s, const unsigned char *buf, int size);
426 426
void avio_wl64(AVIOContext *s, uint64_t val);
427 427
void avio_wb64(AVIOContext *s, uint64_t val);
libavformat/avio_internal.h
40 40
 */
41 41
int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size);
42 42

  
43
void ffio_fill(AVIOContext *s, int b, int count);
44

  
43 45
#endif // AVFORMAT_AVIO_INTERNAL_H
libavformat/aviobuf.c
141 141
        flush_buffer(s);
142 142
}
143 143

  
144
void put_nbyte(AVIOContext *s, int b, int count)
144
void ffio_fill(AVIOContext *s, int b, int count)
145 145
{
146 146
    while (count > 0) {
147 147
        int len = FFMIN(s->buf_end - s->buf_ptr, count);
......
352 352
{
353 353
    avio_write(s, buf, size);
354 354
}
355
void put_nbyte(AVIOContext *s, int b, int count)
356
{
357
    ffio_fill(s, b, count);
358
}
355 359
#endif
356 360

  
357 361
int avio_put_str(AVIOContext *s, const char *str)
libavformat/spdifenc.c
525 525
    if (ctx->out_bytes & 1)
526 526
        spdif_put_16(ctx, s->pb, ctx->out_buf[ctx->out_bytes - 1] << 8);
527 527

  
528
    put_nbyte(s->pb, 0, padding);
528
    ffio_fill(s->pb, 0, padding);
529 529

  
530 530
    av_log(s, AV_LOG_DEBUG, "type=%x len=%i pkt_offset=%i\n",
531 531
           ctx->data_type, ctx->out_bytes, ctx->pkt_offset);

Also available in: Unified diff