diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 17:14:57 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 17:23:00 +0400 |
| commit | b7e9eea31f3e60dc506cf52bb78f0d9f679cb3bd (patch) | |
| tree | 1f16a190ad58a5a7209c610759efeb72d7646ca3 /ffmpeg.h | |
| parent | e13df05fdbb3507d40b8c0e82a05ff67e90b8f3e (diff) | |
| parent | f154ef1ae5b03f288dd8c025dab1884b4cb20c1a (diff) | |
Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'
* commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a':
avconv: send EOF to lavfi even if flushing the decoder fails
avconv: get rid of pointless temporary variable.
avconv: simplify transcode().
avconv: cosmetics
avconv: replace no_packet array in transcode() with a var in InputStream
avconv: remove unused variable from InputFile.
avconv: remove commented out cruft.
avconv: maintain sync on lavfi outputs.
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
| -rw-r--r-- | ffmpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -242,7 +242,7 @@ typedef struct InputStream { typedef struct InputFile { AVFormatContext *ctx; int eof_reached; /* true if eof reached */ - int unavailable; /* true if the file is unavailable (possibly temporarily) */ + int eagain; /* true if last read attempt returned EAGAIN */ int ist_index; /* index of first stream in input_streams */ int64_t ts_offset; int nb_streams; /* number of stream that ffmpeg is aware of; may be different |