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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
	libavcodec/arm/ac3dsp_armv6.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-08-04 01:40:29 +02:00
commit 64160ef392
9 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/8bps.c
View File

@ -230,5 +230,5 @@ AVCodec ff_eightbps_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
.long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
};

4
libavcodec/arm/ac3dsp_armv6.S
View File

@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
ldrb r10, [r4], #1
1:
ldrsh r9, [r0], #2 @ mask[band]
ldr r8, =0x1fe0
mov r8, #0xff0
sub r9, r9, r12 @ - snr_offset
mov r11, r10
ldrb r10, [r4], #1 @ band_start_tab[band++]
@ -45,7 +45,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
it lt
movlt r9, #0
cmp r10, r3 @ - end
and r9, r9, r8 @ & 0x1fe0
and r9, r9, r8, lsl #1 @ & 0x1fe0
ite gt
subgt r8, r3, r11
suble r8, r10, r11

12
libavcodec/arm/asm-offsets.h
View File

@ -29,11 +29,11 @@
#endif
/* MpegEncContext */
#define Y_DC_SCALE 0xb4
#define C_DC_SCALE 0xb8
#define AC_PRED 0xbc
#define BLOCK_LAST_INDEX 0xc0
#define H263_AIC 0xf0
#define INTER_SCANTAB_RASTER_END 0x138
#define Y_DC_SCALE 0xa8
#define C_DC_SCALE 0xac
#define AC_PRED 0xb0
#define BLOCK_LAST_INDEX 0xb4
#define H263_AIC 0xe4
#define INTER_SCANTAB_RASTER_END 0x12c
#endif /* AVCODEC_ARM_ASM_OFFSETS_H */

1
libavcodec/cljr.c
View File

@ -160,7 +160,6 @@ AVCodec ff_cljr_encoder = {
.priv_data_size = sizeof(CLJRContext),
.init = encode_init,
.encode = encode_frame,
//encode_end,
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
};
#endif

3
libavcodec/mpegvideo.h
View File

@ -235,7 +235,6 @@ typedef struct MpegEncContext {
int picture_number; //FIXME remove, unclear definition
int picture_in_gop_number; ///< 0-> first pic in gop, ...
int b_frames_since_non_b; ///< used for encoding, relative to not yet reordered input
int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
int mb_width, mb_height; ///< number of MBs horizontally & vertically
int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11
int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing
@ -262,6 +261,8 @@ typedef struct MpegEncContext {
/* WARNING: changes above this line require updates to hardcoded
* offsets used in asm. */
int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
/** bit output */
PutBitContext pb;

2
libavcodec/tscc.c
View File

@ -208,6 +208,6 @@ AVCodec ff_tscc_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
.long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
};

1
libavcodec/vcr1.c
View File

@ -197,7 +197,6 @@ AVCodec ff_vcr1_encoder = {
.priv_data_size = sizeof(VCR1Context),
.init = encode_init,
.encode = encode_frame,
//encode_end,
.long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
};
#endif

10
libavcodec/xsubdec.c
View File

@ -136,10 +136,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
AVCodec ff_xsub_decoder = {
.name = "xsub",
.type = AVMEDIA_TYPE_SUBTITLE,
.id = CODEC_ID_XSUB,
.init = decode_init,
.decode = decode_frame,
.name = "xsub",
.type = AVMEDIA_TYPE_SUBTITLE,
.id = CODEC_ID_XSUB,
.init = decode_init,
.decode = decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("XSUB"),
};

10
libavcodec/xsubenc.c
View File

@ -211,10 +211,10 @@ static av_cold int xsub_encoder_init(AVCodecContext *avctx)
}
AVCodec ff_xsub_encoder = {
.name = "xsub",
.type = AVMEDIA_TYPE_SUBTITLE,
.id = CODEC_ID_XSUB,
.init = xsub_encoder_init,
.encode = xsub_encode,
.name = "xsub",
.type = AVMEDIA_TYPE_SUBTITLE,
.id = CODEC_ID_XSUB,
.init = xsub_encoder_init,
.encode = xsub_encode,
.long_name = NULL_IF_CONFIG_SMALL("DivX subtitles (XSUB)"),
};