Commit e344c1ea authored by Steve L'Homme's avatar Steve L'Homme Committed by Diego Biurrun

reindentation, patch by From: Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 484267f3
...@@ -44,8 +44,7 @@ static inline Float11* i2f(int16_t i, Float11* f) ...@@ -44,8 +44,7 @@ static inline Float11* i2f(int16_t i, Float11* f)
if (f->sign) if (f->sign)
i = -i; i = -i;
f->exp = av_log2_16bit(i) + !!i; f->exp = av_log2_16bit(i) + !!i;
f->mant = i? (i<<6) >> f->exp : f->mant = i? (i<<6) >> f->exp : 1<<5;
1<<5;
return f; return f;
} }
......
...@@ -302,7 +302,7 @@ static int vmd_read_packet(AVFormatContext *s, ...@@ -302,7 +302,7 @@ static int vmd_read_packet(AVFormatContext *s,
pkt->data, pkt->size, vmd->audio_block_align); pkt->data, pkt->size, vmd->audio_block_align);
} }
av_log(NULL, AV_LOG_INFO, " dispatching %s frame with %d bytes and pts %"PRId64" (%0.1f sec)\n", av_log(NULL, AV_LOG_INFO, " dispatching %s frame with %d bytes and pts %"PRId64" (%0.1f sec)\n",
(frame->frame_record[0] == 0x02) ? "video" : "audio", (frame->frame_record[0] == 0x02) ? "video" : "audio",
frame->frame_size + BYTES_PER_FRAME_RECORD, frame->frame_size + BYTES_PER_FRAME_RECORD,
pkt->pts, (float)(pkt->pts / 90000.0)); pkt->pts, (float)(pkt->pts / 90000.0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment