Mercurial > libavformat.hg

comparison nsvdec.c @ 5910:536e5527c1e0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.
author stefano
date Tue, 30 Mar 2010 23:30:55 +0000
parents 192d6ebe32ff
children 11bb10c37225
comparison
equal deleted inserted replaced
5909:b8041f85c327 5910:536e5527c1e0
454 454
455 nst = av_mallocz(sizeof(NSVStream)); 455 nst = av_mallocz(sizeof(NSVStream));
456 if (!nst) 456 if (!nst)
457 goto fail; 457 goto fail;
458 st->priv_data = nst; 458 st->priv_data = nst;
459 st->codec->codec_type = CODEC_TYPE_VIDEO; 459 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
460 st->codec->codec_tag = vtag; 460 st->codec->codec_tag = vtag;
461 st->codec->codec_id = ff_codec_get_id(nsv_codec_video_tags, vtag); 461 st->codec->codec_id = ff_codec_get_id(nsv_codec_video_tags, vtag);
462 st->codec->width = vwidth; 462 st->codec->width = vwidth;
463 st->codec->height = vheight; 463 st->codec->height = vheight;
464 st->codec->bits_per_coded_sample = 24; /* depth XXX */ 464 st->codec->bits_per_coded_sample = 24; /* depth XXX */
485 485
486 nst = av_mallocz(sizeof(NSVStream)); 486 nst = av_mallocz(sizeof(NSVStream));
487 if (!nst) 487 if (!nst)
488 goto fail; 488 goto fail;
489 st->priv_data = nst; 489 st->priv_data = nst;
490 st->codec->codec_type = CODEC_TYPE_AUDIO; 490 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
491 st->codec->codec_tag = atag; 491 st->codec->codec_tag = atag;
492 st->codec->codec_id = ff_codec_get_id(nsv_codec_audio_tags, atag); 492 st->codec->codec_id = ff_codec_get_id(nsv_codec_audio_tags, atag);
493 493
494 st->need_parsing = AVSTREAM_PARSE_FULL; /* for PCM we will read a chunk later and put correct info */ 494 st->need_parsing = AVSTREAM_PARSE_FULL; /* for PCM we will read a chunk later and put correct info */
495 495