diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 14:06:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 14:06:42 +0100 |
| commit | 29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1 (patch) | |
| tree | 9e2f5bf57e25ccc89adbf2a882f8d4d055a4230f /libavformat | |
| parent | 63753186cc2766e01c6a46d06895a7742c1a768f (diff) | |
| parent | a925f723a915bc0255e2673f8817af5212131763 (diff) | |
| download | ffmpeg-29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1.tar.gz | |
Merge commit 'a925f723a915bc0255e2673f8817af5212131763'
* commit 'a925f723a915bc0255e2673f8817af5212131763':
rtp: Don't read priv_data unless it is allocated
flvenc: Check whether seeking back to the header succeeded
sapenc: Pass the title on to the chained muxers
Conflicts:
libavformat/flvenc.c
libavformat/sapenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvenc.c | 4 | ||||
| -rw-r--r-- | libavformat/rtp.c | 2 | ||||
| -rw-r--r-- | libavformat/sapenc.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e8b7f6c161..502da0f0c5 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -426,11 +426,11 @@ static int flv_write_trailer(AVFormatContext *s) file_size = avio_tell(pb); /* update information */ - if(avio_seek(pb, flv->duration_offset, SEEK_SET) < 0) + if (avio_seek(pb, flv->duration_offset, SEEK_SET) < 0) av_log(s, AV_LOG_WARNING, "Failed to update header with correct duration.\n"); else put_amf_double(pb, flv->duration / (double)1000); - if(avio_seek(pb, flv->filesize_offset, SEEK_SET) < 0) + if (avio_seek(pb, flv->filesize_offset, SEEK_SET) < 0) av_log(s, AV_LOG_WARNING, "Failed to update header with correct filesize.\n"); else put_amf_double(pb, file_size); diff --git a/libavformat/rtp.c b/libavformat/rtp.c index ae0fd58ace..ab0af11cbb 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -97,7 +97,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, AVOutputFormat *ofmt = fmt ? fmt->oformat : NULL; /* Was the payload type already specified for the RTP muxer? */ - if (ofmt && ofmt->priv_class) { + if (ofmt && ofmt->priv_class && fmt->priv_data) { int64_t payload_type; if (av_opt_get_int(fmt->priv_data, "payload_type", 0, &payload_type) >= 0 && payload_type >= 0) diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 87e608298f..6b1cd18bc7 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -23,6 +23,7 @@ #include "libavutil/parseutils.h" #include "libavutil/random_seed.h" #include "libavutil/avstring.h" +#include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/time.h" #include "libavutil/dict.h" @@ -160,9 +161,8 @@ static int sap_write_header(AVFormatContext *s) av_strlcpy(contexts[i]->filename, url, sizeof(contexts[i]->filename)); } - if (s->nb_streams > 0 && title) { + if (s->nb_streams > 0 && title) av_dict_set(&contexts[0]->metadata, "title", title->value, 0); - } ff_url_join(url, sizeof(url), "udp", NULL, announce_addr, port, "?ttl=%d&connect=1", ttl); |