diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-17 03:23:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-17 03:23:19 +0200 |
commit | 22a20dbb7a874c0c99edfa4d1a5d4bee32f3bb08 (patch) | |
tree | 812cb69d600d9d76ccf49d32bfe0b777ad2ba23a /libavfilter/audio.h | |
parent | 3c020b69595954ac18ba27d6b1d8009f7e6bad29 (diff) | |
parent | 164376483f231bc5a488fbee28679df440d6edcb (diff) | |
download | ffmpeg-22a20dbb7a874c0c99edfa4d1a5d4bee32f3bb08.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: use frame queue to determine last used pos
ffplay: factorize frame queue operations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/audio.h')
0 files changed, 0 insertions, 0 deletions