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:
7fff578
f4281f4
)
Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 16 Mar 2013 15:56:30 +0000
(16:56 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 16 Mar 2013 15:56:30 +0000
(16:56 +0100)
* commit '
f4281f457194a6a4489fbd7423e2ab2e13c6d4d9
':
asrc_anullsrc: do not set samplerate and channel layout explicitly
Conflicts:
libavfilter/asrc_anullsrc.c
No change to FFmpeg due to semantic difference between the filter sources
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge