diff options
Diffstat (limited to 'thirdparties/iphone/include/libavformat')
| -rwxr-xr-x | thirdparties/iphone/include/libavformat/avformat.h | 16 | ||||
| -rwxr-xr-x | thirdparties/iphone/include/libavformat/avio.h | 32 |
2 files changed, 24 insertions, 24 deletions
diff --git a/thirdparties/iphone/include/libavformat/avformat.h b/thirdparties/iphone/include/libavformat/avformat.h index f7779e7..3245b22 100755 --- a/thirdparties/iphone/include/libavformat/avformat.h +++ b/thirdparties/iphone/include/libavformat/avformat.h @@ -360,9 +360,9 @@ typedef struct AVProbeData { #else #define AVFMT_TS_NONSTRICT 0x20000 #endif - /**< Format does not require strictly - increasing timestamps, but they must - still be monotonic */ +/**< Format does not require strictly + increasing timestamps, but they must + still be monotonic */ #define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ @@ -1311,7 +1311,7 @@ AVProgram *av_new_program(AVFormatContext *s, int id); #if FF_API_PKT_DUMP attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, - int dump_payload); + int dump_payload); #endif #if FF_API_ALLOC_OUTPUT_CONTEXT @@ -1320,8 +1320,8 @@ attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, */ attribute_deprecated AVFormatContext *avformat_alloc_output_context(const char *format, - AVOutputFormat *oformat, - const char *filename); + AVOutputFormat *oformat, + const char *filename); #endif /** @@ -1768,8 +1768,8 @@ AVOutputFormat *av_guess_format(const char *short_name, * Guess the codec ID based upon muxer and filename. */ enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, - const char *filename, const char *mime_type, - enum AVMediaType type); + const char *filename, const char *mime_type, + enum AVMediaType type); /** * Get timing information for the data currently output. diff --git a/thirdparties/iphone/include/libavformat/avio.h b/thirdparties/iphone/include/libavformat/avio.h index b16d26f..e298363 100755 --- a/thirdparties/iphone/include/libavformat/avio.h +++ b/thirdparties/iphone/include/libavformat/avio.h @@ -120,26 +120,26 @@ typedef struct AVIOContext { * max filesize, used to limit allocations * This field is internal to libavformat and access from outside is not allowed. */ - int64_t maxsize; + int64_t maxsize; - /** - * avio_read and avio_write should if possible be satisfied directly - * instead of going through a buffer, and avio_seek will always - * call the underlying seek function directly. - */ - int direct; + /** + * avio_read and avio_write should if possible be satisfied directly + * instead of going through a buffer, and avio_seek will always + * call the underlying seek function directly. + */ + int direct; /** * Bytes read statistic * This field is internal to libavformat and access from outside is not allowed. */ - int64_t bytes_read; + int64_t bytes_read; /** * seek statistic * This field is internal to libavformat and access from outside is not allowed. */ - int seek_count; + int seek_count; } AVIOContext; /* unbuffered I/O */ @@ -177,13 +177,13 @@ int avio_check(const char *url, int flags); * @return Allocated AVIOContext or NULL on failure. */ AVIOContext *avio_alloc_context( - unsigned char *buffer, - int buffer_size, - int write_flag, - void *opaque, - int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), - int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), - int64_t (*seek)(void *opaque, int64_t offset, int whence)); + unsigned char *buffer, + int buffer_size, + int write_flag, + void *opaque, + int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), + int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), + int64_t (*seek)(void *opaque, int64_t offset, int whence)); void avio_w8(AVIOContext *s, int b); void avio_write(AVIOContext *s, const unsigned char *buf, int size); |
