[FFmpeg-cvslog] avconv: cosmetics, move OutputStream.
Anton Khirnov
git at videolan.org
Fri Aug 19 01:12:07 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Aug 17 18:40:40 2011 +0200| [6494c001bec82fbd1f6835941c54e479cc081ccc] | committer: Anton Khirnov
avconv: cosmetics, move OutputStream.
Allows us to get rid of forward InputStream declaration.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6494c001bec82fbd1f6835941c54e479cc081ccc
---
avconv.c | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/avconv.c b/avconv.c
index 6516da2..24e9521 100644
--- a/avconv.c
+++ b/avconv.c
@@ -218,7 +218,31 @@ static AVBitStreamFilterContext *subtitle_bitstream_filters=NULL;
#define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
-struct InputStream;
+typedef struct InputStream {
+ int file_index;
+ AVStream *st;
+ int discard; /* true if stream data should be discarded */
+ int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */
+ AVCodec *dec;
+
+ int64_t start; /* time when read started */
+ int64_t next_pts; /* synthetic pts for cases where pkt.pts
+ is not defined */
+ int64_t pts; /* current pts */
+ PtsCorrectionContext pts_ctx;
+ double ts_scale;
+ int is_start; /* is 1 at the start and after a discontinuity */
+ int showed_multi_packet_warning;
+ AVDictionary *opts;
+} InputStream;
+
+typedef struct InputFile {
+ AVFormatContext *ctx;
+ int eof_reached; /* true if eof reached */
+ int ist_index; /* index of first stream in ist_table */
+ int buffer_size; /* current total buffer size */
+ int64_t ts_offset;
+} InputFile;
typedef struct OutputStream {
int file_index; /* file index */
@@ -275,31 +299,6 @@ typedef struct OutputStream {
int is_past_recording_time;
} OutputStream;
-typedef struct InputStream {
- int file_index;
- AVStream *st;
- int discard; /* true if stream data should be discarded */
- int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */
- AVCodec *dec;
-
- int64_t start; /* time when read started */
- int64_t next_pts; /* synthetic pts for cases where pkt.pts
- is not defined */
- int64_t pts; /* current pts */
- PtsCorrectionContext pts_ctx;
- double ts_scale;
- int is_start; /* is 1 at the start and after a discontinuity */
- int showed_multi_packet_warning;
- AVDictionary *opts;
-} InputStream;
-
-typedef struct InputFile {
- AVFormatContext *ctx;
- int eof_reached; /* true if eof reached */
- int ist_index; /* index of first stream in ist_table */
- int buffer_size; /* current total buffer size */
- int64_t ts_offset;
-} InputFile;
typedef struct OutputFile {
AVFormatContext *ctx;
More information about the ffmpeg-cvslog
mailing list