diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-24 03:58:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-24 03:58:14 +0200 |
commit | 1aa153d644792d2a9b3a6776b1b0ef906fb7feb1 (patch) | |
tree | 619239b8dfaaef4a2d456afef053fa22d8e24960 /libavformat | |
parent | 50a4d5cfc6749932347ee38c25b5040aea4b13a0 (diff) | |
parent | 7c0c97cc05afeaa52dfad902ae6639557fb71261 (diff) |
Merge remote-tracking branch 'cehoyos/master'
* 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>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index b3eb28738e..ae48c02287 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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; } |