git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a75bf4e
3a14b16
)
Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 Nov 2013 11:23:01 +0000
(12:23 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 Nov 2013 11:31:21 +0000
(12:31 +0100)
* commit '
3a14b160bd442794c6a16a6a883adb547550e847
':
vf_scale: make the dar variable return the DAR.
Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h
See:
61d55fda2b513caf18e37b27aba680a87840904a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge