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:
3cc0f33
2ebaadf
)
Merge remote-tracking branch 'cigaes/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 30 Dec 2013 12:29:47 +0000
(13:29 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 30 Dec 2013 12:29:51 +0000
(13:29 +0100)
* cigaes/master:
lavc/mjpegenc: use proper error codes.
lavc/mjpegenc: check av_frame_alloc() failure.
lavc/libopenjpegenc: check av_frame_alloc() failure.
lavc/diracdec: check av_frame_alloc() failure.
lavc/utils: check av_frame_alloc() failure.
ffprobe: check av_frame_alloc() failure.
lavc/ffwavesynth: fix dependency sizeof(AVFrame).
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge
OSDN Git Service
