RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f' 

* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-23 12:45:15 +02:00
parent 730e07f10b 1e340af8d6
commit d894e64acc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -2486,10 +2486,11 @@ static int transcode_init(void)
oc->interrupt_callback = int_cb; oc->interrupt_callback = int_cb;
if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) { if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) {
char errbuf[128]; char errbuf[128];
const char *errbuf_ptr = errbuf; av_strerror(ret, errbuf, sizeof(errbuf));
if (av_strerror(ret, errbuf, sizeof(errbuf)) < 0) snprintf(error, sizeof(error),
errbuf_ptr = strerror(AVUNERROR(ret)); "Could not write header for output file #%d "
snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?): %s", i, errbuf_ptr); "(incorrect codec parameters ?): %s",
i, errbuf);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto dump_format; goto dump_format;
} }