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 /libavformat | |
| parent | d8ee777021ac251c48274e7fd9864acb9e19a5cb (diff) | |
| parent | 9446d75941d639f19cfa9ae007eb4c5ca041f200 (diff) | |
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 'libavformat')
| -rw-r--r-- | libavformat/rtpenc_latm.c | 4 | ||||
| -rw-r--r-- | libavformat/rtsp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtpenc_latm.c b/libavformat/rtpenc_latm.c index 4430c44afe..7535a0fd5f 100644 --- a/libavformat/rtpenc_latm.c +++ b/libavformat/rtpenc_latm.c @@ -9,13 +9,13 @@ * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b587abb8a9..e8a0cd8198 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1234,10 +1234,10 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, if (reply->transports[0].source[0]) { ff_url_join(url, sizeof(url), "rtp", NULL, reply->transports[0].source, - reply->transports[0].server_port_min, options); + reply->transports[0].server_port_min, "%s", options); } else { ff_url_join(url, sizeof(url), "rtp", NULL, host, - reply->transports[0].server_port_min, options); + reply->transports[0].server_port_min, "%s", options); } if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) { |