virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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
parent 50a4d5cfc6 7c0c97cc05
commit 1aa153d644
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/ffmpeg.texi
View File

@@ -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 As an input option, ignore any timestamps stored in the file and instead
generate timestamps assuming constant frame rate @var{fps}. 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 As an output option, duplicate or drop input frames to achieve constant output
frame rate @var{fps}. frame rate @var{fps}.

2
libavformat/mov.c
View File

@@ -3562,7 +3562,7 @@ static int mov_read_header(AVFormatContext *s)
if (mov->moov_retry) if (mov->moov_retry)
avio_seek(pb, 0, SEEK_SET); avio_seek(pb, 0, SEEK_SET);
if ((err = mov_read_default(mov, pb, atom)) < 0) { 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); mov_read_close(s);
return err; return err;
} }

8
tests/Makefile
View File

@@ -36,10 +36,14 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data
$(M)$< $@ $(FATEW) $(FATEH) $(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) ./$< \ $(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 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 \ -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 \ -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \
-vcodec rawvideo -acodec pcm_s16le \ -vcodec rawvideo -acodec pcm_s16le \