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

avconv: Do not pass NULL to avio_tell

Browse Source 
The null demuxer does not have a backing AVIOContext.
This commit is contained in:
Luca Barbato
2016-12-15 18:59:41 +01:00
parent f8f7ad758d
commit 44129e3804
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
avconv.c
View File

@@ -909,7 +909,7 @@ static void print_report(int is_last_report, int64_t timer_start)
char buf[1024]; char buf[1024];
OutputStream *ost; OutputStream *ost;
AVFormatContext *oc; AVFormatContext *oc;
int64_t total_size; int64_t total_size = 0;
AVCodecContext *enc; AVCodecContext *enc;
int frame_number, vid, i; int frame_number, vid, i;
double bitrate, ti1, pts; double bitrate, ti1, pts;
@@ -934,7 +934,7 @@ static void print_report(int is_last_report, int64_t timer_start)
oc = output_files[0]->ctx; oc = output_files[0]->ctx;
if (oc->pb) {
total_size = avio_size(oc->pb); total_size = avio_size(oc->pb);
if (total_size <= 0) // FIXME improve avio_size() so it works with non seekable output too if (total_size <= 0) // FIXME improve avio_size() so it works with non seekable output too
total_size = avio_tell(oc->pb); total_size = avio_tell(oc->pb);
@@ -945,6 +945,7 @@ static void print_report(int is_last_report, int64_t timer_start)
"avio_tell() failed: %s\n", errbuf); "avio_tell() failed: %s\n", errbuf);
total_size = 0; total_size = 0;
} }
}
buf[0] = '\0'; buf[0] = '\0';
ti1 = 1e10; ti1 = 1e10;