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:
85cabf1
446e37d
)
Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 Nov 2013 20:01:58 +0000
(21:01 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 Nov 2013 20:19:25 +0000
(21:19 +0100)
* commit '
446e37dc97e533e37f6aa0a11355124207e3a7f7
':
vf_fieldorder: remove superfluous get_video_buffer
Conflicts:
libavfilter/vf_fieldorder.c
See:
9b35bee696739eb6774bdba30504c51132e2a934
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge