diff options
| author | Juanjo <pulento@users.sourceforge.net> | 2002-05-02 04:21:22 +0000 |
|---|---|---|
| committer | Juanjo <pulento@users.sourceforge.net> | 2002-05-02 04:21:22 +0000 |
| commit | 95c79a24e5429c510a7e17e84fc02b452060578c (patch) | |
| tree | cfd53fef6fcd3cb1d34f7a067d22d408329be354 | |
| parent | e84c31dc88c883ca85d4ce52bcb882779695b861 (diff) | |
| download | ffmpeg-95c79a24e5429c510a7e17e84fc02b452060578c.tar.gz | |
- Changed FOURCC for H263.
- Warnings fixes.
Originally committed as revision 430 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libav/asf.c | 4 | ||||
| -rw-r--r-- | libav/avienc.c | 4 | ||||
| -rw-r--r-- | libav/grab.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libav/asf.c b/libav/asf.c index 23a2cb3471..74ab459688 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 52fdea237e..43482d0914 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 992236ab03..9c299daf83 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; |