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:
9ace154
c1868e7
)
Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 13 Jan 2014 20:18:39 +0000
(21:18 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 13 Jan 2014 20:23:24 +0000
(21:23 +0100)
* commit '
c1868e7ee7b07b40a0fe15f50df89fe499a01a50
':
lavf: simplify handling of offset in av_probe_input_buuffer()
Conflicts:
libavformat/utils.c
The simplification is broken and does not work at least for ffmpeg,
thus this change is not merged.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge