OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3cc0f33 2ebaadf)
Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Dec 2013 12:29:47 +0000 (13:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Dec 2013 12:29:51 +0000 (13:29 +0100)
commit905bac2cd30d445cd84779068cb168a578511912
tree0caa82ec70f5600fd3c630ffbefeee7468057e67tree | snapshot
parent3cc0f335fe14d05f6f403b09586545f73cc16bc6commit | diff
parent2ebaadf35c9387610ca1eb7e94c171050562a77ccommit | diff
Merge remote-tracking branch 'cigaes/master'

* 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>
external/ffmpeg
About OSDN
Find Software
Develop Software
Help