]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Feb 2015 21:31:29 +0000 (22:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Feb 2015 21:31:32 +0000 (22:31 +0100)
commitbfb988b1fafdc37f88aa64b49360cbbb64fa7e8e
tree5fd0451cae428b0974a0dfdef93817d9dc5887ae
parent1750b45cdf7498d0a05bea29cafcb26aa576d595
parentd45fadb6df484b1c68867220f9c66890b7d29458
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/tscc: Make 32bit output opaque.

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