From 95c79a24e5429c510a7e17e84fc02b452060578c Mon Sep 17 00:00:00 2001
From: Juanjo <pulento@users.sourceforge.net>
Date: Thu, 2 May 2002 04:21:22 +0000
Subject: [PATCH] - Changed FOURCC for H263. - Warnings fixes.
Originally committed as revision 430 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libav/asf.c | 4 ++--
libav/avienc.c | 4 ++--
libav/grab.c | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libav/asf.c b/libav/asf.c
index 23a2cb3471b..74ab4596880 100644
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -124,8 +124,8 @@ static const GUID my_guid = {
};
CodecTag codec_asf_bmp_tags[] = {
- { CODEC_ID_H263, MKTAG('U', '2', '6', '3') },
- { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
+ { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
+ { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
diff --git a/libav/avienc.c b/libav/avienc.c
index 52fdea237e6..43482d0914f 100644
--- a/libav/avienc.c
+++ b/libav/avienc.c
@@ -56,8 +56,8 @@ void end_tag(ByteIOContext *pb, offset_t start)
/* Note: when encoding, the first matching tag is used, so order is
important if multiple tags possible for a given codec. */
CodecTag codec_bmp_tags[] = {
- { CODEC_ID_H263, MKTAG('U', '2', '6', '3') },
- { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
+ { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
+ { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
diff --git a/libav/grab.c b/libav/grab.c
index 992236ab035..9c299daf837 100644
--- a/libav/grab.c
+++ b/libav/grab.c
@@ -238,8 +238,9 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
static int v4l_mm_read_picture(VideoData *s, UINT8 *buf)
{
UINT8 *ptr;
- struct timeval tv_s, tv_e;
- int delay;
+ struct timeval tv_s;
+ //struct timeval tv_e;
+ //int delay;
/* Setup to capture the next frame */
gb_buf.frame = (gb_frame + 1) % gb_buffers.frames;
--
GitLab