virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro

Browse Source 
it just wraps around a bitwise shift, and makes the code harder to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-10-19 11:15:07 +02:00
parent 2a5f4c1ea2
commit fec6d547cc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/wtvdec.c
View File

@@ -46,8 +46,6 @@
* *
*/ */
#define SHIFT_SECTOR_BITS(a) ((int64_t)(a) << WTV_SECTOR_BITS)
typedef struct { typedef struct {
AVIOContext *pb_filesystem; /**< file system (AVFormatContext->pb) */ AVIOContext *pb_filesystem; /**< file system (AVFormatContext->pb) */
@@ -62,7 +60,7 @@ typedef struct {
static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset) static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset)
{ {
return avio_seek(pb, SHIFT_SECTOR_BITS(sector) + offset, SEEK_SET); return avio_seek(pb, (sector << WTV_SECTOR_BITS) + offset, SEEK_SET);
} }
/** /**
@@ -183,7 +181,7 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int
int nb_sectors1 = read_ints(s->pb, sectors1, WTV_SECTOR_SIZE / 4); int nb_sectors1 = read_ints(s->pb, sectors1, WTV_SECTOR_SIZE / 4);
int i; int i;
wf->sectors = av_malloc(SHIFT_SECTOR_BITS(nb_sectors1)); wf->sectors = av_malloc_array(nb_sectors1, 1 << WTV_SECTOR_BITS);
if (!wf->sectors) { if (!wf->sectors) {
av_free(wf); av_free(wf);
return NULL; return NULL;