generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Changed FOURCC for H263.

Browse Source 
- Warnings fixes.

Originally committed as revision 430 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Juanjo 2002-05-02 04:21:22 +00:00
parent e84c31dc88
commit 95c79a24e5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libav/asf.c
View File

@ -124,8 +124,8 @@ static const GUID my_guid = {
}; };
CodecTag codec_asf_bmp_tags[] = { CodecTag codec_asf_bmp_tags[] = {
{ CODEC_ID_H263, MKTAG('U', '2', '6', '3') }, { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263P, MKTAG('U', '2', '6', '3') }, { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },

4
libav/avienc.c
View File

@ -56,8 +56,8 @@ void end_tag(ByteIOContext *pb, offset_t start)
/* Note: when encoding, the first matching tag is used, so order is /* Note: when encoding, the first matching tag is used, so order is
important if multiple tags possible for a given codec. */ important if multiple tags possible for a given codec. */
CodecTag codec_bmp_tags[] = { CodecTag codec_bmp_tags[] = {
{ CODEC_ID_H263, MKTAG('U', '2', '6', '3') }, { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263P, MKTAG('U', '2', '6', '3') }, { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },

5
libav/grab.c
View File

@ -238,8 +238,9 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
static int v4l_mm_read_picture(VideoData *s, UINT8 *buf) static int v4l_mm_read_picture(VideoData *s, UINT8 *buf)
{ {
UINT8 *ptr; UINT8 *ptr;
struct timeval tv_s, tv_e; struct timeval tv_s;
int delay; //struct timeval tv_e;
//int delay;
/* Setup to capture the next frame */ /* Setup to capture the next frame */
gb_buf.frame = (gb_frame + 1) % gb_buffers.frames; gb_buf.frame = (gb_frame + 1) % gb_buffers.frames;