diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
| commit | bb270c0896b39e1ae9277355e3c120ed3feb64a3 (patch) | |
| tree | fc2fc2b1216d19acb3879abb6ea5a3b400f43fe4 /libavcodec/x264.c | |
| parent | 50827fcf44f34521df4708cdb633809b56fb9df3 (diff) | |
| download | ffmpeg-bb270c0896b39e1ae9277355e3c120ed3feb64a3.tar.gz | |
COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x264.c')
| -rw-r--r-- | libavcodec/x264.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/x264.c b/libavcodec/x264.c index b2e922f0a7..fcd0cbd6c2 100644 --- a/libavcodec/x264.c +++ b/libavcodec/x264.c @@ -32,14 +32,14 @@ static void X264_log(void *p, int level, const char *fmt, va_list args) { static const int level_map[] = { - [X264_LOG_ERROR] = AV_LOG_ERROR, - [X264_LOG_WARNING] = AV_LOG_ERROR, - [X264_LOG_INFO] = AV_LOG_INFO, - [X264_LOG_DEBUG] = AV_LOG_DEBUG + [X264_LOG_ERROR] = AV_LOG_ERROR, + [X264_LOG_WARNING] = AV_LOG_ERROR, + [X264_LOG_INFO] = AV_LOG_INFO, + [X264_LOG_DEBUG] = AV_LOG_DEBUG }; if(level < 0 || level > X264_LOG_DEBUG) - return; + return; av_vlog(p, level_map[level], fmt, args); } @@ -52,10 +52,10 @@ encode_nals(uint8_t *buf, int size, x264_nal_t *nals, int nnal) int i; for(i = 0; i < nnal; i++){ - int s = x264_nal_encode(p, &size, 1, nals + i); - if(s < 0) - return -1; - p += s; + int s = x264_nal_encode(p, &size, 1, nals + i); + if(s < 0) + return -1; + p += s; } return p - buf; @@ -74,19 +74,19 @@ X264_frame(AVCodecContext *ctx, uint8_t *buf, int bufsize, void *data) x4->pic.img.i_plane = 3; for(i = 0; i < 3; i++){ - x4->pic.img.plane[i] = frame->data[i]; - x4->pic.img.i_stride[i] = frame->linesize[i]; + x4->pic.img.plane[i] = frame->data[i]; + x4->pic.img.i_stride[i] = frame->linesize[i]; } x4->pic.i_pts = frame->pts; x4->pic.i_type = X264_TYPE_AUTO; if(x264_encoder_encode(x4->enc, &nal, &nnal, &x4->pic, &pic_out)) - return -1; + return -1; bufsize = encode_nals(buf, bufsize, nal, nnal); if(bufsize < 0) - return -1; + return -1; /* FIXME: dts */ x4->out_pic.pts = pic_out.i_pts; @@ -117,7 +117,7 @@ X264_close(AVCodecContext *avctx) X264Context *x4 = avctx->priv_data; if(x4->enc) - x264_encoder_close(x4->enc); + x264_encoder_close(x4->enc); return 0; } |