diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-17 05:49:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-17 05:49:58 +0200 |
| commit | 4f643430f295a8376ca51f127a23b0f8ce92068b (patch) | |
| tree | d21f7dc85241d354636964c50d17481c2442a8da /libavfilter | |
| parent | d8ee777021ac251c48274e7fd9864acb9e19a5cb (diff) | |
| parent | 9446d75941d639f19cfa9ae007eb4c5ca041f200 (diff) | |
| download | ffmpeg-4f643430f295a8376ca51f127a23b0f8ce92068b.tar.gz | |
Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'
* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
ffmpeg: merge output_codecs array into AVOutputStream members.
rtpenc_latm: Consistently use "Libav" in license boilerplate.
rtsp: Don't pass string pointer as format string to ff_url_join
mmsh: fixed printf injection bug in mmsh request
codec-regression: remove pointless -r options for dnxhd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions