virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

matroskadec: cosmetics

Browse Source 
Originally committed as revision 14579 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:41:22 +00:00
parent c171af9bd7
commit 8f35a2c022
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroskadec.c
View File

@ -1280,9 +1280,7 @@ matroska_execute_seekhead(MatroskaDemuxContext *matroska)
static int static int
matroska_aac_profile (char *codec_id) matroska_aac_profile (char *codec_id)
{ {
static const char *aac_profiles[] = { static const char *aac_profiles[] = { "MAIN", "LC", "SSR" };
"MAIN", "LC", "SSR"
};
int profile; int profile;
for (profile=0; profile<ARRAY_SIZE(aac_profiles); profile++) for (profile=0; profile<ARRAY_SIZE(aac_profiles); profile++)
@ -1536,8 +1534,7 @@ matroska_read_header (AVFormatContext *s,
if (codec_id == CODEC_ID_NONE) if (codec_id == CODEC_ID_NONE)
av_log(matroska->ctx, AV_LOG_INFO, av_log(matroska->ctx, AV_LOG_INFO,
"Unknown/unsupported CodecID %s.\n", "Unknown/unsupported CodecID %s.\n", track->codec_id);
track->codec_id);
av_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */ av_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */
@ -1815,8 +1812,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
uint8_t *pkt_data = data; uint8_t *pkt_data = data;
if (encodings && encodings->scope & 1) { if (encodings && encodings->scope & 1) {
offset = matroska_decode_buffer(&pkt_data, &pkt_size, offset = matroska_decode_buffer(&pkt_data,&pkt_size, track);
track);
if (offset < 0) if (offset < 0)
continue; continue;
} }