git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a78ec1
de38e7c
)
Merge remote-tracking branch 'cigaes/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Apr 2013 23:49:08 +0000
(
01:49
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Apr 2013 23:49:39 +0000
(
01:49
+0200)
* cigaes/master:
ffmpeg: use a rational for -aspect option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
ffmpeg.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ffmpeg.c
Simple merge