diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-14 19:49:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-14 19:49:11 +0200 |
| commit | ecaf5143282cc7a8335f5e19c750de66b1ee8389 (patch) | |
| tree | 1b3f22b8f0bd0363491f09b287749dbc38a69473 /libavformat/rtsp.c | |
| parent | d9c9a0c76738446ad3d4e899f525766d53dd0ded (diff) | |
| parent | 24efdea7fd024431f8ddd2b08c9390eba08c91f1 (diff) | |
| download | ffmpeg-ecaf5143282cc7a8335f5e19c750de66b1ee8389.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacenc: Fix number of coefficients used in a LFE channel.
aacenc: Fix a segfault with grouped psymodel.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
0 files changed, 0 insertions, 0 deletions