wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'cehoyos/master'

Browse source 
* cehoyos/master:
  fate: Fix ffprobe tests with --target-path set.
  doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
  Do not print a useless error number if mov header reading fails.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-24 03:58:11 +02:00
commit 1aa153d644
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavformat/mov.c
View file

@ -3562,7 +3562,7 @@ static int mov_read_header(AVFormatContext *s)
if (mov->moov_retry)
avio_seek(pb, 0, SEEK_SET);
if ((err = mov_read_default(mov, pb, atom)) < 0) {
av_log(s, AV_LOG_ERROR, "error reading header: %d\n", err);
av_log(s, AV_LOG_ERROR, "error reading header\n");
mov_read_close(s);
return err;
}