diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 13:03:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 13:03:50 +0200 |
| commit | 01b4689d2032994f3eac790f11e5d062b6f945db (patch) | |
| tree | 601bd8474fecbc57f80daaec5bc9b242357810ee /libavfilter/af_aecho.c | |
| parent | 208f9dd2ef06c5cfcb6ca494f35aba9149776e37 (diff) | |
| parent | f8d1bb6723a677d7221c674a4e47e3d4cecfca17 (diff) | |
| download | ffmpeg-01b4689d2032994f3eac790f11e5d062b6f945db.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: rename main_channel_id to stream_id.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aecho.c')
0 files changed, 0 insertions, 0 deletions