RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8' 

* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
  cavs: more K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-16 11:05:02 +02:00
parent 12e9821042 3b4fa54866
commit 3a8b52c011
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/cavs.c
View File

@ -54,7 +54,7 @@ static const uint8_t tc_tab[64] = {
};
/** mark block as unavailable, i.e. out of picture
or not yet decoded */
* or not yet decoded */
static const cavs_vector un_mv = { 0, 0, 1, NOT_AVAIL };
static const int8_t left_modifier_l[8] = { 0, -1, 6, -1, -1, 7, 6, 7 };
@ -248,10 +248,9 @@ static void intra_pred_vert(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
{
int y;
uint64_t a = AV_RN64(&top[1]);
for (y = 0; y < 8; y++) {
for (y = 0; y < 8; y++)
*((uint64_t *)(d + y * stride)) = a;
}
}
static void intra_pred_horiz(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
{
@ -455,7 +454,7 @@ static inline void mc_part_std(AVSContext *h, int chroma_height, int delta,
qpel_mc_func *qpix_op = qpix_put;
h264_chroma_mc_func chroma_op = chroma_put;
dest_y += 2 * x_offset + 2 * y_offset*h->l_stride;
dest_y += x_offset * 2 + y_offset * h->l_stride * 2;
dest_cb += x_offset + y_offset * h->c_stride;
dest_cr += x_offset + y_offset * h->c_stride;
x_offset += 8 * h->mbx;