[FFmpeg-devel] [FFmpeg-cvslog] Merge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4'

[James Almer]

On 10/5/2017 11:59 PM, Michael Niedermayer wrote:
> On Thu, Oct 05, 2017 at 09:15:13PM -0300, James Almer wrote:
>> On 10/5/2017 8:10 PM, Michael Niedermayer wrote:
>>> On Wed, Oct 04, 2017 at 02:20:07AM +0000, James Almer wrote:
>>>> ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct  3 23:08:06 2017 -0300| [1e7b6e47d2752a91bcd6d0c91ed2aaf118eaeee9] | committer: James Almer
>>>>
>>>> Merge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4'
>>>>
>>>> * commit '79331df362fb05a0d04ca9489c87e5b80077a3f4':
>>>>   rtsp: Lazily set up the pollfd array once
>>>>
>>>> Merged-by: James Almer <jamrial at gmail.com>
>>>>
>>>>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e7b6e47d2752a91bcd6d0c91ed2aaf118eaeee9
>>>> ---
>>>>
>>>>  libavformat/rtsp.c | 53 ++++++++++++++++++++++++++---------------------------
>>>>  libavformat/rtsp.h |  1 +
>>>>  2 files changed, 27 insertions(+), 27 deletions(-)
>>>
>>> This breaks rtsp
>>>
>>> example:
>>> ./ffmpeg -itsoffset 2 -re -i matrixbench_mpeg2.mpg -acodec libspeex -ar 16K -ac 1 -vn -t 3 -f rtp rtp://127.0.0.1:19745 > speex.sdp </dev/null & sleep 1 ; ./ffmpeg -protocol_whitelist file,rtp,udp -i speex.sdp -y -t 0.9 out.wav
>>>
>>> segfaults but i think this is not specific to this one case
>>
>> Libav commit ca960161f087ca38267b88ce90592010c59584f1 seems to fix it
>> for me. If you can confirm that I'll cherry-pick it asap.
> 
> confirmed
> 
> thx

Cherry picked and pushed.