ffmpeg-cvslog

Download

ffmpeg-cvslog@ffmpeg.org

March 2016

9 participants
422 discussions

avformat/rtpdec_h264: Ignore invalid sprop-parameter-sets missing PPS
by git＠videolan.org 01 Mar '16

01 Mar '16

ffmpeg | branch: master | Andrew Shulgin <andrewshulginua(a)gmail.com> | Sat Feb 27 21:32:53 2016 +0200| [1c7e2cf9d33968375ee4025d2279c937e147dae2] | committer: Michael Niedermayer avformat/rtpdec_h264: Ignore invalid sprop-parameter-sets missing PPS Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c7e2cf9d33968375… --- libavformat/rtpdec_h264.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index b399be4..e707d03 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -166,6 +166,10 @@ static int sdp_parse_fmtp_config_h264(AVFormatContext *s, parse_profile_level_id(s, h264_data, value); } else if (!strcmp(attr, "sprop-parameter-sets")) { int ret; + if (value[strlen(value) - 1] == ',') { + av_log(s, AV_LOG_WARNING, "Missing PPS in sprop-parameter-sets, ignoring\n"); + return 0; + } codec->extradata_size = 0; av_freep(&codec->extradata); ret = ff_h264_parse_sprop_parameter_sets(s, &codec->extradata,

1 0

lavu/rational: add more info regarding floor(x+0.5) usage
by git＠videolan.org 01 Mar '16

01 Mar '16

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanag(a)gmail.com> | Wed Feb 24 20:47:00 2016 -0500| [7dabc78ce13e3baa37292f42df2364b4ccd2aa78] | committer: Ganesh Ajjanagadde lavu/rational: add more info regarding floor(x+0.5) usage Add some more verbose info regarding why the imprecise and slow floor(x+0.5) hack is used; helpful for future maintenance. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanag(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7dabc78ce13e3baa3… --- libavutil/rational.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/rational.c b/libavutil/rational.c index 6b3f50a..cab4438 100644 --- a/libavutil/rational.c +++ b/libavutil/rational.c @@ -115,7 +115,8 @@ AVRational av_d2q(double d, int max) frexp(d, &exponent); exponent = FFMAX(exponent-1, 0); den = 1LL << (61 - exponent); - // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64 + // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64, + // see Ticket2713 for affected gcc/glibc versions av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max); if ((!a.num || !a.den) && d && max>0 && max<INT_MAX) av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, INT_MAX);

1 0

Jump to page: