- Warnings fixes.
Originally committed as revision 430 to svn://svn.ffmpeg.org/ffmpeg/trunk
};
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') },
/* 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') },
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;