generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: remove some useless empty lines

Browse Source 
Originally committed as revision 14581 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:41:28 +00:00
parent 5efc8ec850
commit 7eb9b068eb
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/matroskadec.c
View File

@ -461,7 +461,6 @@ static EbmlSyntax matroska_clusters[] = {
* The opposite isn't done - that's auto-done using master * The opposite isn't done - that's auto-done using master
* element reading. * element reading.
*/ */
static int static int
ebml_read_element_level_up (MatroskaDemuxContext *matroska) ebml_read_element_level_up (MatroskaDemuxContext *matroska)
{ {
@ -491,7 +490,6 @@ ebml_read_element_level_up (MatroskaDemuxContext *matroska)
* number. * number.
* Returns: num. of bytes read. < 0 on error. * Returns: num. of bytes read. < 0 on error.
*/ */
static int static int
ebml_read_num (MatroskaDemuxContext *matroska, ebml_read_num (MatroskaDemuxContext *matroska,
int max_size, int max_size,
@ -542,7 +540,6 @@ ebml_read_num (MatroskaDemuxContext *matroska,
* Read: the element content data ID. * Read: the element content data ID.
* Return: the number of bytes read or < 0 on error. * Return: the number of bytes read or < 0 on error.
*/ */
static int static int
ebml_read_element_id (MatroskaDemuxContext *matroska, ebml_read_element_id (MatroskaDemuxContext *matroska,
uint32_t *id, uint32_t *id,
@ -575,7 +572,6 @@ ebml_read_element_id (MatroskaDemuxContext *matroska,
* Read: element content length. * Read: element content length.
* Return: the number of bytes read or < 0 on error. * Return: the number of bytes read or < 0 on error.
*/ */
static int static int
ebml_read_element_length (MatroskaDemuxContext *matroska, ebml_read_element_length (MatroskaDemuxContext *matroska,
uint64_t *length) uint64_t *length)
@ -592,7 +588,6 @@ ebml_read_element_length (MatroskaDemuxContext *matroska,
* Level_up contains the amount of levels that this * Level_up contains the amount of levels that this
* next element lies higher than the previous one. * next element lies higher than the previous one.
*/ */
static uint32_t static uint32_t
ebml_peek_id (MatroskaDemuxContext *matroska, ebml_peek_id (MatroskaDemuxContext *matroska,
int *level_up) int *level_up)
@ -609,7 +604,6 @@ ebml_peek_id (MatroskaDemuxContext *matroska,
* Seek to a given offset. * Seek to a given offset.
* 0 is success, -1 is failure. * 0 is success, -1 is failure.
*/ */
static int static int
ebml_read_seek (MatroskaDemuxContext *matroska, ebml_read_seek (MatroskaDemuxContext *matroska,
offset_t offset) offset_t offset)
@ -626,7 +620,6 @@ ebml_read_seek (MatroskaDemuxContext *matroska,
* Skip the next element. * Skip the next element.
* 0 is success, -1 is failure. * 0 is success, -1 is failure.
*/ */
static int static int
ebml_read_skip (MatroskaDemuxContext *matroska) ebml_read_skip (MatroskaDemuxContext *matroska)
{ {
@ -648,7 +641,6 @@ ebml_read_skip (MatroskaDemuxContext *matroska)
* Read the next element as an unsigned int. * Read the next element as an unsigned int.
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_uint (MatroskaDemuxContext *matroska, ebml_read_uint (MatroskaDemuxContext *matroska,
uint32_t *id, uint32_t *id,
@ -682,7 +674,6 @@ ebml_read_uint (MatroskaDemuxContext *matroska,
* Read the next element as a float. * Read the next element as a float.
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_float (MatroskaDemuxContext *matroska, ebml_read_float (MatroskaDemuxContext *matroska,
uint32_t *id, uint32_t *id,
@ -716,7 +707,6 @@ ebml_read_float (MatroskaDemuxContext *matroska,
* Read the next element as an ASCII string. * Read the next element as an ASCII string.
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_ascii (MatroskaDemuxContext *matroska, ebml_read_ascii (MatroskaDemuxContext *matroska,
uint32_t *id, uint32_t *id,
@ -754,7 +744,6 @@ ebml_read_ascii (MatroskaDemuxContext *matroska,
* are supposed to be sub-elements which can be read separately. * are supposed to be sub-elements which can be read separately.
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_master (MatroskaDemuxContext *matroska, ebml_read_master (MatroskaDemuxContext *matroska,
uint32_t *id) uint32_t *id)
@ -785,7 +774,6 @@ ebml_read_master (MatroskaDemuxContext *matroska,
* Read the next element as binary data. * Read the next element as binary data.
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_binary (MatroskaDemuxContext *matroska, ebml_read_binary (MatroskaDemuxContext *matroska,
uint32_t *id, uint32_t *id,
@ -822,7 +810,6 @@ ebml_read_binary (MatroskaDemuxContext *matroska,
* Return: number of bytes processed, < 0 on error. * Return: number of bytes processed, < 0 on error.
* XXX: use ebml_read_num(). * XXX: use ebml_read_num().
*/ */
static int static int
matroska_ebmlnum_uint (uint8_t *data, matroska_ebmlnum_uint (uint8_t *data,
uint32_t size, uint32_t size,
@ -864,7 +851,6 @@ matroska_ebmlnum_uint (uint8_t *data,
/* /*
* Same as above, but signed. * Same as above, but signed.
*/ */
static int static int
matroska_ebmlnum_sint (uint8_t *data, matroska_ebmlnum_sint (uint8_t *data,
uint32_t size, uint32_t size,
@ -907,7 +893,6 @@ matroska_find_track_by_num (MatroskaDemuxContext *matroska,
* Put one packet in an application-supplied AVPacket struct. * Put one packet in an application-supplied AVPacket struct.
* Returns 0 on success or -1 on failure. * Returns 0 on success or -1 on failure.
*/ */
static int static int
matroska_deliver_packet (MatroskaDemuxContext *matroska, matroska_deliver_packet (MatroskaDemuxContext *matroska,
AVPacket *pkt) AVPacket *pkt)
@ -935,7 +920,6 @@ matroska_deliver_packet (MatroskaDemuxContext *matroska,
* Put a packet into our internal queue. Will be delivered to the * Put a packet into our internal queue. Will be delivered to the
* user/application during the next get_packet() call. * user/application during the next get_packet() call.
*/ */
static void static void
matroska_queue_packet (MatroskaDemuxContext *matroska, matroska_queue_packet (MatroskaDemuxContext *matroska,
AVPacket *pkt) AVPacket *pkt)
@ -969,7 +953,6 @@ matroska_clear_queue (MatroskaDemuxContext *matroska)
/* /*
* Autodetecting... * Autodetecting...
*/ */
static int static int
matroska_probe (AVProbeData *p) matroska_probe (AVProbeData *p)
{ {
@ -1008,7 +991,6 @@ matroska_probe (AVProbeData *p)
return 0; return 0;
} }
static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
void *data, uint32_t expected_id, int once); void *data, uint32_t expected_id, int once);
@ -1103,7 +1085,6 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
if (once) if (once)
break; break;
if (matroska->level_up) { if (matroska->level_up) {
matroska->level_up--; matroska->level_up--;
break; break;
@ -1425,16 +1406,13 @@ matroska_read_header (AVFormatContext *s,
(track->codec_priv.data != NULL)) { (track->codec_priv.data != NULL)) {
track->video.fourcc = AV_RL32(track->codec_priv.data + 16); track->video.fourcc = AV_RL32(track->codec_priv.data + 16);
codec_id = codec_get_id(codec_bmp_tags, track->video.fourcc); codec_id = codec_get_id(codec_bmp_tags, track->video.fourcc);
} }
else if (!strcmp(track->codec_id, else if (!strcmp(track->codec_id,
MATROSKA_CODEC_ID_AUDIO_ACM) && MATROSKA_CODEC_ID_AUDIO_ACM) &&
(track->codec_priv.size >= 18) && (track->codec_priv.size >= 18) &&
(track->codec_priv.data != NULL)) { (track->codec_priv.data != NULL)) {
uint16_t tag = AV_RL16(track->codec_priv.data); uint16_t tag = AV_RL16(track->codec_priv.data);
codec_id = codec_get_id(codec_wav_tags, tag); codec_id = codec_get_id(codec_wav_tags, tag);
} }
else if (!strcmp(track->codec_id, "V_QUICKTIME") && else if (!strcmp(track->codec_id, "V_QUICKTIME") &&
@ -1461,7 +1439,6 @@ matroska_read_header (AVFormatContext *s,
} else } else
extradata_size = 2; extradata_size = 2;
} }
else if (codec_id == CODEC_ID_TTA) { else if (codec_id == CODEC_ID_TTA) {
ByteIOContext b; ByteIOContext b;
extradata_size = 30; extradata_size = 30;
@ -1477,18 +1454,15 @@ matroska_read_header (AVFormatContext *s,
put_le32(&b, track->audio.out_samplerate); put_le32(&b, track->audio.out_samplerate);
put_le32(&b, matroska->ctx->duration * track->audio.out_samplerate); put_le32(&b, matroska->ctx->duration * track->audio.out_samplerate);
} }
else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 || else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 ||
codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) { codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) {
extradata_offset = 26; extradata_offset = 26;
track->codec_priv.size -= extradata_offset; track->codec_priv.size -= extradata_offset;
} }
else if (codec_id == CODEC_ID_RA_144) { else if (codec_id == CODEC_ID_RA_144) {
track->audio.out_samplerate = 8000; track->audio.out_samplerate = 8000;
track->audio.channels = 1; track->audio.channels = 1;
} }
else if (codec_id == CODEC_ID_RA_288 || else if (codec_id == CODEC_ID_RA_288 ||
codec_id == CODEC_ID_COOK || codec_id == CODEC_ID_COOK ||
codec_id == CODEC_ID_ATRAC3) { codec_id == CODEC_ID_ATRAC3) {
@ -1562,7 +1536,6 @@ matroska_read_header (AVFormatContext *s,
} else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) { } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) {
st->codec->codec_type = CODEC_TYPE_SUBTITLE; st->codec->codec_type = CODEC_TYPE_SUBTITLE;
} }
} }
attachements = attachements_list->elem; attachements = attachements_list->elem;
@ -1856,10 +1829,8 @@ matroska_read_packet (AVFormatContext *s,
MatroskaDemuxContext *matroska = s->priv_data; MatroskaDemuxContext *matroska = s->priv_data;
while (matroska_deliver_packet(matroska, pkt)) { while (matroska_deliver_packet(matroska, pkt)) {
if (matroska->done) if (matroska->done)
return AVERROR(EIO); return AVERROR(EIO);
if (matroska_parse_cluster(matroska) < 0) if (matroska_parse_cluster(matroska) < 0)
matroska->done = 1; matroska->done = 1;
} }