Changeset 21a96468ba1dea744e473d8db48a4ee25a2d4818
- Timestamp:
- 02/07/08 21:57:30
(5 months ago)
- Author:
- Laurent Aimar <fenrir@videolan.org>
- git-committer:
- Laurent Aimar <fenrir@videolan.org> 1215028650 +0000
- git-parent:
[0bac0634f9a8e0ef9d8e78b2abbcae7e49deb4b6]
- git-author:
- Laurent Aimar <fenrir@videolan.org> 1215018751 +0000
- Message:
Cosmetics (replace defines by pointers)
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r0bac063 |
r21a9646 |
|
| 624 | 624 | for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ ) |
|---|
| 625 | 625 | { |
|---|
| 626 | | #define codec p_cl->codec[i_codec] |
|---|
| | 626 | asf_codec_entry_t *p_codec = &p_cl->codec[i_codec]; |
|---|
| 627 | 627 | int i_len, i; |
|---|
| 628 | 628 | |
|---|
| 629 | | codec.i_type = GetWLE( p_data ); p_data += 2; |
|---|
| | 629 | p_codec->i_type = GetWLE( p_data ); p_data += 2; |
|---|
| 630 | 630 | /* codec name */ |
|---|
| 631 | 631 | i_len = GetWLE( p_data ); p_data += 2; |
|---|
| 632 | | codec.psz_name = calloc( i_len + 1, sizeof(char) ); |
|---|
| | 632 | p_codec->psz_name = calloc( i_len + 1, sizeof(char) ); |
|---|
| 633 | 633 | for( i = 0; i < i_len; i++ ) |
|---|
| 634 | 634 | { |
|---|
| 635 | | codec.psz_name[i] = GetWLE( p_data + 2*i ); |
|---|
| | 635 | p_codec->psz_name[i] = GetWLE( p_data + 2*i ); |
|---|
| 636 | 636 | } |
|---|
| 637 | | codec.psz_name[i_len] = '\0'; |
|---|
| | 637 | p_codec->psz_name[i_len] = '\0'; |
|---|
| 638 | 638 | p_data += 2 * i_len; |
|---|
| 639 | 639 | |
|---|
| 640 | 640 | /* description */ |
|---|
| 641 | 641 | i_len = GetWLE( p_data ); p_data += 2; |
|---|
| 642 | | codec.psz_description = calloc( i_len + 1, sizeof(char) ); |
|---|
| | 642 | p_codec->psz_description = calloc( i_len + 1, sizeof(char) ); |
|---|
| 643 | 643 | for( i = 0; i < i_len; i++ ) |
|---|
| 644 | 644 | { |
|---|
| 645 | | codec.psz_description[i] = GetWLE( p_data + 2*i ); |
|---|
| | 645 | p_codec->psz_description[i] = GetWLE( p_data + 2*i ); |
|---|
| 646 | 646 | } |
|---|
| 647 | | codec.psz_description[i_len] = '\0'; |
|---|
| | 647 | p_codec->psz_description[i_len] = '\0'; |
|---|
| 648 | 648 | p_data += 2 * i_len; |
|---|
| 649 | 649 | |
|---|
| 650 | 650 | /* opaque information */ |
|---|
| 651 | | codec.i_information_length = GetWLE( p_data ); p_data += 2; |
|---|
| 652 | | if( codec.i_information_length > 0 ) |
|---|
| | 651 | p_codec->i_information_length = GetWLE( p_data ); p_data += 2; |
|---|
| | 652 | if( p_codec->i_information_length > 0 ) |
|---|
| 653 | 653 | { |
|---|
| 654 | | codec.p_information = malloc( codec.i_information_length ); |
|---|
| 655 | | memcpy( codec.p_information, p_data, codec.i_information_length ); |
|---|
| 656 | | p_data += codec.i_information_length; |
|---|
| | 654 | p_codec->p_information = malloc( p_codec->i_information_length ); |
|---|
| | 655 | memcpy( p_codec->p_information, p_data, p_codec->i_information_length ); |
|---|
| | 656 | p_data += p_codec->i_information_length; |
|---|
| 657 | 657 | } |
|---|
| 658 | 658 | else |
|---|
| 659 | 659 | { |
|---|
| 660 | | codec.p_information = NULL; |
|---|
| | 660 | p_codec->p_information = NULL; |
|---|
| 661 | 661 | } |
|---|
| 662 | | #undef codec |
|---|
| 663 | 662 | } |
|---|
| 664 | 663 | } |
|---|
| … | … | |
| 697 | 696 | for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ ) |
|---|
| 698 | 697 | { |
|---|
| 699 | | #define codec p_cl->codec[i_codec] |
|---|
| 700 | | FREENULL( codec.psz_name ); |
|---|
| 701 | | FREENULL( codec.psz_description ); |
|---|
| 702 | | FREENULL( codec.p_information ); |
|---|
| 703 | | #undef codec |
|---|
| | 698 | asf_codec_entry_t *p_codec = &p_cl->codec[i_codec]; |
|---|
| | 699 | |
|---|
| | 700 | FREENULL( p_codec->psz_name ); |
|---|
| | 701 | FREENULL( p_codec->psz_description ); |
|---|
| | 702 | FREENULL( p_codec->p_information ); |
|---|
| 704 | 703 | } |
|---|
| 705 | 704 | FREENULL( p_cl->codec ); |
|---|