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

comment typo fixes

Browse Source 
Originally committed as revision 11294 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-12-21 11:50:18 +00:00
parent 56b69633dd
commit 8bfb108b3e
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffserver.c
View File

@ -234,14 +234,14 @@ typedef struct FFStream {
int conns_served; int conns_served;
int64_t bytes_served; int64_t bytes_served;
int64_t feed_max_size; /* maximum storage size, zero means unlimited */ int64_t feed_max_size; /* maximum storage size, zero means unlimited */
int64_t feed_write_index; /* current write position in feed (it wraps round) */ int64_t feed_write_index; /* current write position in feed (it wraps around) */
int64_t feed_size; /* current size of feed */ int64_t feed_size; /* current size of feed */
struct FFStream *next_feed; struct FFStream *next_feed;
} FFStream; } FFStream;
typedef struct FeedData { typedef struct FeedData {
long long data_count; long long data_count;
float avg_frame_size; /* frame size averraged over last frames with exponential mean */ float avg_frame_size; /* frame size averaged over last frames with exponential mean */
} FeedData; } FeedData;
static struct sockaddr_in my_http_addr; static struct sockaddr_in my_http_addr;

8
libavcodec/avcodec.h
View File

@ -747,10 +747,10 @@ typedef struct AVPanScan{
* Audio Video Frame. * Audio Video Frame.
* New fields can be added to the end of FF_COMMON_FRAME with minor version * New fields can be added to the end of FF_COMMON_FRAME with minor version
* bumps. * bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. No fields should be added into AVFrame before or after * version bump. No fields should be added into AVFrame before or after
* FF_COMMON_FRAME! * FF_COMMON_FRAME!
* sizeof(AVFrame) must not be used outside libav* * sizeof(AVFrame) must not be used outside libav*.
*/ */
typedef struct AVFrame { typedef struct AVFrame {
FF_COMMON_FRAME FF_COMMON_FRAME
@ -761,9 +761,9 @@ typedef struct AVFrame {
/** /**
* main external API structure. * main external API structure.
* New fields can be added to the end with minor version bumps. * New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. * version bump.
* sizeof(AVCodecContext) must not be used outside libav* * sizeof(AVCodecContext) must not be used outside libav*.
*/ */
typedef struct AVCodecContext { typedef struct AVCodecContext {
/** /**

2
libavcodec/imgresample.c
View File

@ -391,7 +391,7 @@ static void component_resample(ImgReSampleContext *s,
h_resample(new_line, owidth, h_resample(new_line, owidth,
src_line, iwidth, - FCENTER * POS_FRAC, s->h_incr, src_line, iwidth, - FCENTER * POS_FRAC, s->h_incr,
&s->h_filters[0][0]); &s->h_filters[0][0]);
/* handle ring buffer wraping */ /* handle ring buffer wrapping */
if (ring_y >= LINE_BUF_HEIGHT) { if (ring_y >= LINE_BUF_HEIGHT) {
memcpy(s->line_buf + (ring_y - LINE_BUF_HEIGHT) * owidth, memcpy(s->line_buf + (ring_y - LINE_BUF_HEIGHT) * owidth,
new_line, owidth); new_line, owidth);

37
libavformat/avformat.h
View File

@ -272,21 +272,21 @@ typedef struct AVIndexEntry {
/** /**
* Stream structure. * Stream structure.
* New fields can be added to the end with minor version bumps. * New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. * version bump.
* sizeof(AVStream) must not be used outside libav* * sizeof(AVStream) must not be used outside libav*.
*/ */
typedef struct AVStream { typedef struct AVStream {
int index; /**< stream index in AVFormatContext */ int index; /**< stream index in AVFormatContext */
int id; /**< format specific stream id */ int id; /**< format specific stream id */
AVCodecContext *codec; /**< codec context */ AVCodecContext *codec; /**< codec context */
/** /**
* real base frame rate of the stream. * Real base frame rate of the stream.
* this is the lowest framerate with which all timestamps can be * This is the lowest frame rate with which all timestamps can be
* represented accurately (it is the least common multiple of all * represented accurately (it is the least common multiple of all
* frame rates in the stream), Note, this value is just a guess! * frame rates in the stream), Note, this value is just a guess!
* for example if the timebase is 1/90000 and all frames have either * For example if the timebase is 1/90000 and all frames have either
* approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1 * approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1.
*/ */
AVRational r_frame_rate; AVRational r_frame_rate;
void *priv_data; void *priv_data;
@ -297,8 +297,8 @@ typedef struct AVStream {
struct AVFrac pts; struct AVFrac pts;
/** /**
* this is the fundamental unit of time (in seconds) in terms * This is the fundamental unit of time (in seconds) in terms
* of which frame timestamps are represented. for fixed-fps content, * of which frame timestamps are represented. For fixed-fps content,
* timebase should be 1/frame rate and timestamp increments should be * timebase should be 1/frame rate and timestamp increments should be
* identically 1. * identically 1.
*/ */
@ -312,16 +312,16 @@ typedef struct AVStream {
* MN: dunno if that is the right place for it */ * MN: dunno if that is the right place for it */
float quality; float quality;
/** /**
* decoding: pts of the first frame of the stream, in stream time base. * Decoding: pts of the first frame of the stream, in stream time base.
* only set this if you are absolutely 100% sure that the value you set * Only set this if you are absolutely 100% sure that the value you set
* it to really is the pts of the first frame * it to really is the pts of the first frame.
* This may be undefined (AV_NOPTS_VALUE). * This may be undefined (AV_NOPTS_VALUE).
* @note the ASF header does NOT contain a correct start_time the ASF * @note The ASF header does NOT contain a correct start_time the ASF
* demuxer must NOT set this * demuxer must NOT set this.
*/ */
int64_t start_time; int64_t start_time;
/** /**
* decoding: duration of the stream, in stream time base. * Decoding: duration of the stream, in stream time base.
* If a source file does not specify a duration, but does specify * If a source file does not specify a duration, but does specify
* a bitrate, this value will be estimates from bit rate and file size. * a bitrate, this value will be estimates from bit rate and file size.
*/ */
@ -351,11 +351,10 @@ typedef struct AVStream {
#define AV_PROGRAM_RUNNING 1 #define AV_PROGRAM_RUNNING 1
/** /**
*
* New fields can be added to the end with minor version bumps. * New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. * version bump.
* sizeof(AVProgram) must not be used outside libav* * sizeof(AVProgram) must not be used outside libav*.
*/ */
typedef struct AVProgram { typedef struct AVProgram {
int id; int id;
@ -375,9 +374,9 @@ typedef struct AVProgram {
/** /**
* format I/O context. * format I/O context.
* New fields can be added to the end with minor version bumps. * New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. * version bump.
* sizeof(AVFormatContext) must not be used outside libav* * sizeof(AVFormatContext) must not be used outside libav*.
*/ */
typedef struct AVFormatContext { typedef struct AVFormatContext {
const AVClass *av_class; /**< set by av_alloc_format_context */ const AVClass *av_class; /**< set by av_alloc_format_context */

17
libavformat/avio.h
View File

@ -32,9 +32,9 @@ typedef int64_t offset_t;
/** /**
* URL Context. * URL Context.
* New fields can be added to the end with minor version bumps. * New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. * version bump.
* sizeof(URLContext) must not be used outside libav* * sizeof(URLContext) must not be used outside libav*.
*/ */
struct URLContext { struct URLContext {
struct URLProtocol *prot; struct URLProtocol *prot;
@ -69,7 +69,7 @@ offset_t url_filesize(URLContext *h);
/** /**
* Return the maximum packet size associated to packetized file * Return the maximum packet size associated to packetized file
* handle. If the file is not packetized (stream like http or file on * handle. If the file is not packetized (stream like HTTP or file on
* disk), then 0 is returned. * disk), then 0 is returned.
* *
* @param h file handle * @param h file handle
@ -79,10 +79,10 @@ int url_get_max_packet_size(URLContext *h);
void url_get_filename(URLContext *h, char *buf, int buf_size); void url_get_filename(URLContext *h, char *buf, int buf_size);
/** /**
* the callback is called in blocking functions to test regulary if * The callback is called in blocking functions to test regulary if
* asynchronous interruption is needed. AVERROR(EINTR) is returned * asynchronous interruption is needed. AVERROR(EINTR) is returned
* in this case by the interrupted function. 'NULL' means no interrupt * in this case by the interrupted function. 'NULL' means no interrupt
* callback is given. i * callback is given.
*/ */
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb); void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
@ -95,9 +95,10 @@ int url_poll(URLPollEntry *poll_table, int n, int timeout);
* @param pause 1 for pause, 0 for resume * @param pause 1 for pause, 0 for resume
*/ */
int av_url_read_pause(URLContext *h, int pause); int av_url_read_pause(URLContext *h, int pause);
/** /**
* Seek to a given timestamp relative to some component stream. * Seek to a given timestamp relative to some component stream.
* Only meaningful if using a network streaming protocol (e.g. MMS.) * Only meaningful if using a network streaming protocol (e.g. MMS.).
* @param stream_index The stream index that the timestamp is relative to. * @param stream_index The stream index that the timestamp is relative to.
* If stream_index is (-1) the timestamp should be in AV_TIME_BASE * If stream_index is (-1) the timestamp should be in AV_TIME_BASE
* units from the beginning of the presentation. * units from the beginning of the presentation.
@ -145,9 +146,9 @@ int register_protocol(URLProtocol *protocol);
/** /**
* Bytestream IO Context. * Bytestream IO Context.
* New fields can be added to the end with minor version bumps. * New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a Major * Removal, reordering and changes to existing fields require a major
* version bump. * version bump.
* sizeof(ByteIOContext) must not be used outside libav* * sizeof(ByteIOContext) must not be used outside libav*.
*/ */
typedef struct { typedef struct {
unsigned char *buffer; unsigned char *buffer;