virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'

Browse Source 
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-06 10:57:04 +02:00
parent 3fa72de82f 811bd07846
commit 7cbef2ed7e
5 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.h
View File

@@ -93,6 +93,7 @@ typedef struct OptionsContext {
/* input options */
int64_t input_ts_offset;
int rate_emu;
int accurate_seek;
SpecifierOpt *ts_scale;
int nb_ts_scale;
@@ -282,10 +283,12 @@ typedef struct InputFile {
int ist_index; /* index of first stream in input_streams */
int64_t ts_offset;
int64_t last_ts;
int64_t start_time; /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
int nb_streams; /* number of stream that ffmpeg is aware of; may be different
from ctx.nb_streams if new streams appear during av_read_frame() */
int nb_streams_warn; /* number of streams that the user was warned of */
int rate_emu;
int accurate_seek;
#if HAVE_PTHREADS
pthread_t thread; /* thread reading from this file */