Revision e63a3628 libavformat/avio.h

View differences:

libavformat/avio.h
378 378
                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
379 379
                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
380 380
                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
381

  
382
/**
383
 * @defgroup old_avio_funcs Old put_/get_*() functions
384
 * @deprecated use the avio_ -prefixed functions instead.
385
 * @{
386
 */
387
attribute_deprecated int          get_buffer(AVIOContext *s, unsigned char *buf, int size);
388
attribute_deprecated int          get_byte(AVIOContext *s);
389
attribute_deprecated unsigned int get_le16(AVIOContext *s);
390
attribute_deprecated unsigned int get_le24(AVIOContext *s);
391
attribute_deprecated unsigned int get_le32(AVIOContext *s);
392
attribute_deprecated uint64_t     get_le64(AVIOContext *s);
393
attribute_deprecated unsigned int get_be16(AVIOContext *s);
394
attribute_deprecated unsigned int get_be24(AVIOContext *s);
395
attribute_deprecated unsigned int get_be32(AVIOContext *s);
396
attribute_deprecated uint64_t     get_be64(AVIOContext *s);
397
/**
398
 * @}
399
 */
381 400
#endif
382 401

  
383 402
AVIOContext *avio_alloc_context(
......
477 496
 * Read size bytes from AVIOContext into buf.
478 497
 * @return number of bytes read or AVERROR
479 498
 */
480
int get_buffer(AVIOContext *s, unsigned char *buf, int size);
499
int avio_read(AVIOContext *s, unsigned char *buf, int size);
481 500

  
482 501
/**
483 502
 * Read size bytes from AVIOContext into buf.
......
489 508

  
490 509
/** @note return 0 if EOF, so you cannot use it if EOF handling is
491 510
    necessary */
492
int get_byte(AVIOContext *s);
493
unsigned int get_le24(AVIOContext *s);
494
unsigned int get_le32(AVIOContext *s);
495
uint64_t get_le64(AVIOContext *s);
496
unsigned int get_le16(AVIOContext *s);
511
int          avio_r8  (AVIOContext *s);
512
unsigned int avio_rl16(AVIOContext *s);
513
unsigned int avio_rl24(AVIOContext *s);
514
unsigned int avio_rl32(AVIOContext *s);
515
uint64_t     avio_rl64(AVIOContext *s);
497 516

  
498 517
/**
499 518
 * Read a UTF-16 string from pb and convert it to UTF-8.
......
505 524
int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
506 525

  
507 526
char *get_strz(AVIOContext *s, char *buf, int maxlen);
508
unsigned int get_be16(AVIOContext *s);
509
unsigned int get_be24(AVIOContext *s);
510
unsigned int get_be32(AVIOContext *s);
511
uint64_t get_be64(AVIOContext *s);
527
unsigned int avio_rb16(AVIOContext *s);
528
unsigned int avio_rb24(AVIOContext *s);
529
unsigned int avio_rb32(AVIOContext *s);
530
uint64_t     avio_rb64(AVIOContext *s);
512 531

  
513 532
uint64_t ff_get_v(AVIOContext *bc);
514 533

  

Also available in: Unified diff