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

Remove useless casts and memset.

Browse Source 
Originally committed as revision 24186 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-07-11 07:45:42 +00:00
parent e1d7c8831c
commit 3174073623
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/dvbsubdec.c
View File

@ -356,9 +356,7 @@ static void delete_state(DVBSubContext *ctx)
static av_cold int dvbsub_init_decoder(AVCodecContext *avctx) static av_cold int dvbsub_init_decoder(AVCodecContext *avctx)
{ {
int i, r, g, b, a = 0; int i, r, g, b, a = 0;
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
memset(avctx->priv_data, 0, sizeof(DVBSubContext));
ctx->composition_id = avctx->sub_id & 0xffff; ctx->composition_id = avctx->sub_id & 0xffff;
ctx->ancillary_id = avctx->sub_id >> 16; ctx->ancillary_id = avctx->sub_id >> 16;
@ -428,7 +426,7 @@ static av_cold int dvbsub_init_decoder(AVCodecContext *avctx)
static av_cold int dvbsub_close_decoder(AVCodecContext *avctx) static av_cold int dvbsub_close_decoder(AVCodecContext *avctx)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
DVBSubRegionDisplay *display; DVBSubRegionDisplay *display;
delete_state(ctx); delete_state(ctx);
@ -731,7 +729,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display, static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,
const uint8_t *buf, int buf_size, int top_bottom, int non_mod) const uint8_t *buf, int buf_size, int top_bottom, int non_mod)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
DVBSubRegion *region = get_region(ctx, display->region_id); DVBSubRegion *region = get_region(ctx, display->region_id);
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
@ -848,7 +846,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
static void dvbsub_parse_object_segment(AVCodecContext *avctx, static void dvbsub_parse_object_segment(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
const uint8_t *block; const uint8_t *block;
@ -907,7 +905,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx,
static void dvbsub_parse_clut_segment(AVCodecContext *avctx, static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int clut_id; int clut_id;
@ -995,7 +993,7 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
static void dvbsub_parse_region_segment(AVCodecContext *avctx, static void dvbsub_parse_region_segment(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int region_id, object_id; int region_id, object_id;
@ -1107,7 +1105,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,
static void dvbsub_parse_page_segment(AVCodecContext *avctx, static void dvbsub_parse_page_segment(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
DVBSubRegionDisplay *display; DVBSubRegionDisplay *display;
DVBSubRegionDisplay *tmp_display_list, **tmp_ptr; DVBSubRegionDisplay *tmp_display_list, **tmp_ptr;
@ -1311,7 +1309,7 @@ static void dvbsub_parse_display_definition_segment(AVCodecContext *avctx,
static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf, static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
int buf_size, AVSubtitle *sub) int buf_size, AVSubtitle *sub)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
DVBSubDisplayDefinition *display_def = ctx->display_definition; DVBSubDisplayDefinition *display_def = ctx->display_definition;
DVBSubRegion *region; DVBSubRegion *region;
@ -1399,8 +1397,8 @@ static int dvbsub_decode(AVCodecContext *avctx,
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = avctx->priv_data;
AVSubtitle *sub = (AVSubtitle*) data; AVSubtitle *sub = data;
const uint8_t *p, *p_end; const uint8_t *p, *p_end;
int segment_type; int segment_type;
int page_id; int page_id;