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

Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'

Browse Source 
* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
  mdec: cosmetics, reformat

Conflicts:
	libavcodec/mdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-29 13:57:57 +01:00
commit f02033b98b
1 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mdec.c
View File

@ -119,7 +119,8 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n)
return 0;
}
static inline int decode_mb(MDECContext *a, int16_t block[6][64]){
static inline int decode_mb(MDECContext *a, int16_t block[6][64])
{
int i;
const int block_index[6] = { 5, 4, 0, 1, 2, 3 };
@ -133,7 +134,8 @@ static inline int decode_mb(MDECContext *a, int16_t block[6][64]){
return 0;
}
static inline void idct_put(MDECContext *a, int mb_x, int mb_y){
static inline void idct_put(MDECContext *a, int mb_x, int mb_y)
{
int16_t (*block)[64] = a->block;
int linesize = a->picture.linesize[0];
@ -156,9 +158,9 @@ static int decode_frame(AVCodecContext *avctx,
void *data, int *got_frame,
AVPacket *avpkt)
{
MDECContext * const a = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MDECContext * const a = avctx->priv_data;
AVFrame *picture = data;
AVFrame * const p = &a->picture;
int i;
@ -189,9 +191,7 @@ static int decode_frame(AVCodecContext *avctx,
a->qscale = get_bits(&a->gb, 16);
a->version = get_bits(&a->gb, 16);
a->last_dc[0]=
a->last_dc[1]=
a->last_dc[2]= 128;
a->last_dc[0] = a->last_dc[1] = a->last_dc[2] = 128;
for (a->mb_x = 0; a->mb_x < a->mb_width; a->mb_x++) {
for (a->mb_y = 0; a->mb_y < a->mb_height; a->mb_y++) {
@ -211,7 +211,8 @@ static int decode_frame(AVCodecContext *avctx,
return (get_bits_count(&a->gb) + 31) / 32 * 4;
}
static av_cold int decode_init(AVCodecContext *avctx){
static av_cold int decode_init(AVCodecContext *avctx)
{
MDECContext * const a = avctx->priv_data;
AVFrame *p = &a->picture;
@ -235,7 +236,8 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0;
}
static av_cold int decode_init_thread_copy(AVCodecContext *avctx){
static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
{
MDECContext * const a = avctx->priv_data;
AVFrame *p = &a->picture;
@ -247,8 +249,8 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx){
return 0;
}
static av_cold int decode_end(AVCodecContext *avctx){
static av_cold int decode_end(AVCodecContext *avctx)
{
MDECContext * const a = avctx->priv_data;
if (a->picture.data[0])