OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 11:59:04 +0000 (12:59 +0100)
commit171bd38edad5e7057a2a251e07a0547ad708a718
tree18200e08cf7b712e8c5b9d91a6d968eaf2da5cfe
parentac1cea55ad0f2c98c5ba7f082c56e2211711e421
parent6552808014ae318c8feaa8effac6ee40ea6019ce
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c
libavfilter/buffersrc.c