diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:56:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:57:08 +0100 |
| commit | ac6e074fb711468a2ff3f241a1641dc5b34b386d (patch) | |
| tree | 3bf8ed5dfef4709e9a0112628f54dc5673892fe0 | |
| parent | 56ca871fb3d6c60a97ac678a919d8253fcb3ebdd (diff) | |
| parent | ed79093222ceb42f0c3a39095a69af0b32be5450 (diff) | |
| download | ffmpeg-ac6e074fb711468a2ff3f241a1641dc5b34b386d.tar.gz | |
Merge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'
* commit 'ed79093222ceb42f0c3a39095a69af0b32be5450':
rtpdec: Add a terminating null byte at the end of the SDES/CNAME
yuv4mpeg: do not use deprecated functions
oggdec: fix faulty cleanup prototype
idcin: return 0 from idcin_read_packet() on success.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/idcin.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 5 | ||||
| -rw-r--r-- | libavformat/yuv4mpeg.c | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c index fcbf1c15a6..6bda74c19a 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -345,7 +345,7 @@ static int idcin_read_packet(AVFormatContext *s, if (idcin->audio_present) idcin->next_chunk_is_video ^= 1; - return ret; + return 0; } static int idcin_read_seek(AVFormatContext *s, int stream_index, diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 6079d9a226..13ad4aa127 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -307,13 +307,14 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, avio_w8(pb, (RTP_VERSION << 6) + 1); /* 1 report block */ avio_w8(pb, RTCP_SDES); len = strlen(s->hostname); - avio_wb16(pb, (6 + len + 3) / 4); /* length in words - 1 */ + avio_wb16(pb, (7 + len + 3) / 4); /* length in words - 1 */ avio_wb32(pb, s->ssrc + 1); avio_w8(pb, 0x01); avio_w8(pb, len); avio_write(pb, s->hostname, len); + avio_w8(pb, 0); /* END */ // padding - for (len = (6 + len) % 4; len % 4; len++) + for (len = (7 + len) % 4; len % 4; len++) avio_w8(pb, 0); avio_flush(pb); diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 9c9c7fa8fe..ff039bd37a 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -18,6 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/pixdesc.h" #include "avformat.h" #include "internal.h" #include "libavutil/pixdesc.h" @@ -211,8 +213,8 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) if (st->codec->pix_fmt != AV_PIX_FMT_GRAY8 && st->codec->pix_fmt != AV_PIX_FMT_GRAY16) { // Adjust for smaller Cb and Cr planes - avcodec_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift, - &v_chroma_shift); + av_pix_fmt_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift, + &v_chroma_shift); width >>= h_chroma_shift; height >>= v_chroma_shift; |