virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

Browse Source 
* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-24 21:08:19 +01:00
commit 70a25587d2
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ffmpeg.c
View File

@ -2156,7 +2156,6 @@ static int init_input_stream(int ist_index, char *error, int error_len)
ist->next_pts = AV_NOPTS_VALUE; ist->next_pts = AV_NOPTS_VALUE;
ist->next_dts = AV_NOPTS_VALUE; ist->next_dts = AV_NOPTS_VALUE;
ist->is_start = 1;
return 0; return 0;
} }

1
ffmpeg.h
View File

@ -255,7 +255,6 @@ typedef struct InputStream {
int64_t filter_in_rescale_delta_last; int64_t filter_in_rescale_delta_last;
double ts_scale; double ts_scale;
int is_start; /* is 1 at the start and after a discontinuity */
int saw_first_ts; int saw_first_ts;
int showed_multi_packet_warning; int showed_multi_packet_warning;
AVDictionary *opts; AVDictionary *opts;