git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
58677d7
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 1 Sep 2011 20:08:03 +0000
(22:08 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 1 Sep 2011 20:08:44 +0000
(22:08 +0200)
* qatar/master:
avconv: fix some bugs introduced in
630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
libmp3lame: fix typo
AVOptions: drop av_ prefix from static av_get_number().
libx264: use X264_THREADS_AUTO constant instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
No differences found