diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-11 21:55:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-11 21:55:32 +0200 |
| commit | 94d5650266f3bd5a43088f4419a1d60f89d6249c (patch) | |
| tree | 5c37c2ef86355dbb423fb7c3ba80bc13a5fe9064 /libavcodec/g722dec.c | |
| parent | 65efc66d8ea9aee562d26e2522ad94229649897a (diff) | |
| parent | f862537de8ba7920e0f25318c03f8982a3c6294c (diff) | |
| download | ffmpeg-94d5650266f3bd5a43088f4419a1d60f89d6249c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Do not send extension for flv files
rtmp: support connection parameters
doc: Add documentation for the newly added rtmp_* options
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions