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 | |
| parent | 50a4d5cfc6749932347ee38c25b5040aea4b13a0 (diff) | |
| parent | 7c0c97cc05afeaa52dfad902ae6639557fb71261 (diff) | |
| download | ffmpeg-1aa153d644792d2a9b3a6776b1b0ef906fb7feb1.tar.gz | |
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>
| -rw-r--r-- | doc/ffmpeg.texi | 3 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | tests/Makefile | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 69ffa878fb..1bca962662 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -473,6 +473,9 @@ Set frame rate (Hz value, fraction or abbreviation). As an input option, ignore any timestamps stored in the file and instead generate timestamps assuming constant frame rate @var{fps}. +This is not the same as the @option{-framerate} option used for some input formats +like image2 or v4l2 (it used to be the same in older versions of FFmpeg). +If in doubt use @option{-framerate} instead of the input option @option{-r}. As an output option, duplicate or drop input frames to achieve constant output frame rate @var{fps}. 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; } diff --git a/tests/Makefile b/tests/Makefile index dd015ed5cd..07557f97b3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -36,10 +36,14 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data $(M)$< $@ $(FATEW) $(FATEH) -tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data +tests/test.ffmeta: TAG = COPY +tests/test.ffmeta: + $(M)cp -f $(SRC_PATH)/tests/test.ffmeta $(TARGET_PATH)/tests/test.ffmeta + +tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/test.ffmeta $(M)$(TARGET_EXEC) ./$< \ -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ - -f ffmetadata -i $(SRC_PATH)/tests/test.ffmeta \ + -f ffmetadata -i $(TARGET_PATH)/tests/test.ffmeta \ -flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \ -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \ -vcodec rawvideo -acodec pcm_s16le \ |