git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e58677
9b60d90
)
Merge remote-tracking branch 'lukaszmluki/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 8 May 2014 01:49:04 +0000
(
03:49
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 8 May 2014 01:49:12 +0000
(
03:49
+0200)
* lukaszmluki/master:
lavc: use av_fifo_freep
lavf: use av_fifo_freep
ffmpeg: use av_fifo_freep
lavd/jack_audio: use av_fifo_freep
lavfi: use av_fifo_freep
lavu/fifo: add av_fifo_freep function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge