OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa7031a 7e6c67d)
Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 13:30:26 +0000 (14:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 13:30:33 +0000 (14:30 +0100)
commit975fbd43addbf70c047167b761ddcf06e8083c14
tree9f33eb323cea5b961dc96f8b71d8d26483eec635tree | snapshot
parentfa7031ad37526bc9916e87dda25547ebbb6f4a3bcommit | diff
parent7e6c67dd24d767bfa71ec9cfefca5833535aaa84commit | diff
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/buffersink: fix header.
  lavfi/buffersrc: disable deprecated warnings.
  lavfi/buffersrc: check channel count changes.
  lavfi/buffersrc: set channel layout if it is known.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/buffersrc.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help