diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 11:48:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 11:48:14 +0100 |
| commit | 34c1c08c665389daa190cb331e4d899da8dde57a (patch) | |
| tree | 4102f99b0b4cc834d0b9b6ccaef586753ad9c0f0 /libavfilter/avf_showwaves.c | |
| parent | 8c3ae9ee66a2fb094b188c994a18df9f3e69a283 (diff) | |
| parent | 86d9181cf41edc3382bf2481f95a2fb321058689 (diff) | |
| download | ffmpeg-34c1c08c665389daa190cb331e4d899da8dde57a.tar.gz | |
Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'
* commit '86d9181cf41edc3382bf2481f95a2fb321058689':
rtpdec: Support sending RTCP feedback packets
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_showwaves.c')
0 files changed, 0 insertions, 0 deletions