OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
50a4d5c
7c0c97c
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 24 Aug 2014 01:58:11 +0000
(
03:58
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 24 Aug 2014 01:58:14 +0000
(
03:58
+0200)
* 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>
Trivial merge
OSDN Git Service
