Mercurial > libavformat.hg

comparison mov.c @ 1353:c2e922377f8b libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove useless casts
author bcoudurier
date Wed, 04 Oct 2006 13:18:51 +0000
parents 531c75b73254
children 0899bfe4105c
comparison
equal deleted inserted replaced
1352:e3d0366c8dfb 1353:c2e922377f8b
494 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); 494 st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
495 if (st->codec->extradata) { 495 if (st->codec->extradata) {
496 get_buffer(pb, st->codec->extradata, len); 496 get_buffer(pb, st->codec->extradata, len);
497 st->codec->extradata_size = len; 497 st->codec->extradata_size = len;
498 /* from mplayer */ 498 /* from mplayer */
499 if ((*(uint8_t *)st->codec->extradata >> 3) == 29) { 499 if ((*st->codec->extradata >> 3) == 29) {
500 st->codec->codec_id = CODEC_ID_MP3ON4; 500 st->codec->codec_id = CODEC_ID_MP3ON4;
501 } 501 }
502 } 502 }
503 } 503 }
504 } 504 }
647 st->codec->extradata_size = 0x5a + atom.size; 647 st->codec->extradata_size = 0x5a + atom.size;
648 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); 648 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
649 649
650 if (st->codec->extradata) { 650 if (st->codec->extradata) {
651 strcpy(st->codec->extradata, "SVQ3"); // fake 651 strcpy(st->codec->extradata, "SVQ3"); // fake
652 get_buffer(pb, (uint8_t *)st->codec->extradata + 0x5a, atom.size); 652 get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
653 dprintf("Reading SMI %"PRId64" %s\n", atom.size, (char*)st->codec->extradata + 0x5a); 653 dprintf("Reading SMI %"PRId64" %s\n", atom.size, st->codec->extradata + 0x5a);
654 } else 654 } else
655 url_fskip(pb, atom.size); 655 url_fskip(pb, atom.size);
656 656
657 return 0; 657 return 0;
658 } 658 }
687 av_free(st->codec->extradata); 687 av_free(st->codec->extradata);
688 st->codec->extradata_size = 36; 688 st->codec->extradata_size = 36;
689 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); 689 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
690 690
691 if (st->codec->extradata) { 691 if (st->codec->extradata) {
692 strcpy((char *)st->codec->extradata + 4, "alac"); // fake 692 strcpy(st->codec->extradata + 4, "alac"); // fake
693 get_buffer(pb, (uint8_t *)st->codec->extradata + 8, 36 - 8); 693 get_buffer(pb, st->codec->extradata + 8, 36 - 8);
694 dprintf("Reading alac %d %s\n", st->codec->extradata_size, (char*)st->codec->extradata); 694 dprintf("Reading alac %d %s\n", st->codec->extradata_size, st->codec->extradata);
695 } else 695 } else
696 url_fskip(pb, atom.size); 696 url_fskip(pb, atom.size);
697 return 0; 697 return 0;
698 } 698 }
699 699
733 st->codec->extradata_size = atom.size + 8; 733 st->codec->extradata_size = atom.size + 8;
734 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); 734 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
735 735
736 /* pass all jp2h atom to codec */ 736 /* pass all jp2h atom to codec */
737 if (st->codec->extradata) { 737 if (st->codec->extradata) {
738 strcpy((char *)st->codec->extradata + 4, "jp2h"); 738 strcpy(st->codec->extradata + 4, "jp2h");
739 get_buffer(pb, (uint8_t *)st->codec->extradata + 8, atom.size); 739 get_buffer(pb, st->codec->extradata + 8, atom.size);
740 } else 740 } else
741 url_fskip(pb, atom.size); 741 url_fskip(pb, atom.size);
742 return 0; 742 return 0;
743 } 743 }
744 744