summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-18 12:55:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-18 12:55:31 +0100
commit82e82fa2e5bb262b3447ee53705f378917e4f6f1 (patch)
tree2e953ae803f7b2c98c1f1e560a0b5dae6447c3c2 /libavfilter
parent4b7c81c3e059ae08e4aa74222de1762342ef8abf (diff)
parentaa11cb79318baa3415d553424ba378f6c62e1f9b (diff)
downloadffmpeg-streaming-82e82fa2e5bb262b3447ee53705f378917e4f6f1.zip
ffmpeg-streaming-82e82fa2e5bb262b3447ee53705f378917e4f6f1.tar.gz
Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'
* commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b': build: make audio_frame_queue a stand-alone component Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud