virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cosmetic (place { consistently)

Browse Source 
Originally committed as revision 11066 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-11-19 20:30:00 +00:00
parent 2b013568f9
commit 5b2052b38f
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavcodec/dvbsubdec.c
View File

@ -313,8 +313,7 @@ static void delete_state(DVBSubContext *ctx)
DVBSubRegion *region; DVBSubRegion *region;
DVBSubCLUT *clut; DVBSubCLUT *clut;
while (ctx->region_list) while (ctx->region_list) {
{
region = ctx->region_list; region = ctx->region_list;
ctx->region_list = region->next; ctx->region_list = region->next;
@ -326,8 +325,7 @@ static void delete_state(DVBSubContext *ctx)
av_free(region); av_free(region);
} }
while (ctx->clut_list) while (ctx->clut_list) {
{
clut = ctx->clut_list; clut = ctx->clut_list;
ctx->clut_list = clut->next; ctx->clut_list = clut->next;
@ -420,8 +418,7 @@ static int dvbsub_close_decoder(AVCodecContext *avctx)
delete_state(ctx); delete_state(ctx);
while (ctx->display_list) while (ctx->display_list) {
{
display = ctx->display_list; display = ctx->display_list;
ctx->display_list = display->next; ctx->display_list = display->next;
@ -739,8 +736,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
#endif #endif
#ifdef DEBUG_PACKET_CONTENTS #ifdef DEBUG_PACKET_CONTENTS
for (i = 0; i < buf_size; i++) for (i = 0; i < buf_size; i++) {
{
if (i % 16 == 0) if (i % 16 == 0)
av_log(avctx, AV_LOG_INFO, "0x%08p: ", buf+i); av_log(avctx, AV_LOG_INFO, "0x%08p: ", buf+i);
@ -912,8 +908,7 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
av_log(avctx, AV_LOG_INFO, "DVB clut packet:\n"); av_log(avctx, AV_LOG_INFO, "DVB clut packet:\n");
for (i=0; i < buf_size; i++) for (i=0; i < buf_size; i++) {
{
av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]); av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
if (i % 16 == 15) if (i % 16 == 15)
av_log(avctx, AV_LOG_INFO, "\n"); av_log(avctx, AV_LOG_INFO, "\n");
@ -940,8 +935,7 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
ctx->clut_list = clut; ctx->clut_list = clut;
} }
while (buf + 4 < buf_end) while (buf + 4 < buf_end) {
{
entry_id = *buf++; entry_id = *buf++;
depth = (*buf) & 0xe0; depth = (*buf) & 0xe0;
@ -1006,8 +1000,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,
region = get_region(ctx, region_id); region = get_region(ctx, region_id);
if (region == NULL) if (region == NULL) {
{
region = av_mallocz(sizeof(DVBSubRegion)); region = av_mallocz(sizeof(DVBSubRegion));
region->id = region_id; region->id = region_id;
@ -1125,8 +1118,7 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx,
av_log(avctx, AV_LOG_INFO, "Page time out %ds, state %d\n", ctx->time_out, page_state); av_log(avctx, AV_LOG_INFO, "Page time out %ds, state %d\n", ctx->time_out, page_state);
#endif #endif
if (page_state == 2) if (page_state == 2) {
{
delete_state(ctx); delete_state(ctx);
} }
@ -1363,8 +1355,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
av_log(avctx, AV_LOG_INFO, "DVB sub packet:\n"); av_log(avctx, AV_LOG_INFO, "DVB sub packet:\n");
for (i=0; i < buf_size; i++) for (i=0; i < buf_size; i++) {
{
av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]); av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
if (i % 16 == 15) if (i % 16 == 15)
av_log(avctx, AV_LOG_INFO, "\n"); av_log(avctx, AV_LOG_INFO, "\n");
@ -1381,8 +1372,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
p = buf; p = buf;
p_end = buf + buf_size; p_end = buf + buf_size;
while (p < p_end && *p == 0x0f) while (p < p_end && *p == 0x0f) {
{
p += 1; p += 1;
segment_type = *p++; segment_type = *p++;
page_id = AV_RB16(p); page_id = AV_RB16(p);
@ -1419,8 +1409,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
p += segment_length; p += segment_length;
} }
if (p != p_end) if (p != p_end) {
{
#ifdef DEBUG #ifdef DEBUG
av_log(avctx, AV_LOG_INFO, "Junk at end of packet\n"); av_log(avctx, AV_LOG_INFO, "Junk at end of packet\n");
#endif #endif