summaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2011-12-08 18:44:37 +0100
committerMichael Niedermayer <[email protected]>2011-12-08 18:44:46 +0100
commit15c481614bb410cfa147f8051024d42b01eadff8 (patch)
tree7f1ea068f15a2576bc527e6862e8abdcf3ce2607 /avconv.c
parente2baaa21aabc7edb3c2275eac39ed1d40884b25a (diff)
parent6d4deecfdf0fe18d1a4b06aac49cabcdb9a25d3c (diff)
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall: Pass pointer to integer buffer instead of integer to memcpy Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'avconv.c')
0 files changed, 0 insertions, 0 deletions