OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5abbeef e995cf1)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 12:51:09 +0000 (13:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 12:51:44 +0000 (13:51 +0100)
* qatar/master:
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/af_volume.c patch | diff1 | diff2 | blob | history
libavfilter/vf_hqdn3d.c patch | diff1 | diff2 | blob | history

diff --cc libavfilter/af_volume.c
Simple merge
diff --cc libavfilter/vf_hqdn3d.c
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help