OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a808733 f22c24b)
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 12:38:40 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 12:38:44 +0000 (14:38 +0200)
* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help