eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

Browse Source 
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
  fate-vc1: add dependencies
  ARM: fix overreads in neon h264 chroma mc
  rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
  gitignore: ignore files created by msvc
  fate: Add proper dependencies for the tests in video.mak
  configure: Disable Snow decoder and encoder by default
  lzo: Drop obsolete fast_memcpy reference
  build: Drop OBJS declaration for non-existing PCM_DVD encoder
  mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all

Conflicts:
	libavcodec/mpegvideo.c
	libavformat/rtsp.c
	tests/fate/microsoft.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-20 12:37:52 +02:00
parent cdea54b4c8 c9ef43215c
commit 04c6ecb7da
9 changed files with 119 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtsp.c
View File

@@ -1805,7 +1805,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
ret = rt->recvbuf_pos < rt->recvbuf_len;
}
} else
av_assert0(0);
ret = -1;
if (ret == 0) {
rt->cur_transport_priv = NULL;
return 0;