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:
271f959
a964d6a
)
Merge remote-tracking branch 'cigaes/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 20 Mar 2013 12:57:59 +0000
(13:57 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 20 Mar 2013 12:58:04 +0000
(13:58 +0100)
* cigaes/master:
lavu/frame: use channels rather than channel_layout.
lavf: avformat_seek_file(): validate stream_index.
lavf/concatdec: fix possible leak in case of malloc failure.
lavfi/buffersink: check av_frame_ref() failure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge