In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful.
Showing the changes to libavformat/eacdata.c (1 of 107 files). Show all
Unified · Split
| @@ -51,7 +51,7 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap) · 50 unmodified lines | |||
| 51 | unsigned int sample_rate, header; | 51 | unsigned int sample_rate, header; |
| 52 | AVStream *st; | 52 | AVStream *st; |
| 53 | 53 | ||
| 54 | header = get_be16(pb); | 54 | header = avio_rb16(pb); |
| 55 | switch (header) { | 55 | switch (header) { |
| 56 | case 0x0400: cdata->channels = 1; break; | 56 | case 0x0400: cdata->channels = 1; break; |
| 57 | case 0x0404: cdata->channels = 2; break; | 57 | case 0x0404: cdata->channels = 2; break; |
| @@ -61,7 +61,7 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap) · 3 unmodified lines | |||
| 61 | return -1; | 61 | return -1; |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | sample_rate = get_be16(pb); | 64 | sample_rate = avio_rb16(pb); |
| 65 | url_fskip(pb, 12); | 65 | url_fskip(pb, 12); |
| 66 | 66 | ||
| 67 | st = av_new_stream(s, 0); | 67 | st = av_new_stream(s, 0); |