[FFmpeg-cvslog] Cosmetics: Fix indentation and add braces after last commit.

Carl Eugen Hoyos git at videolan.org
Mon May 6 22:31:13 CEST 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon May  6 21:31:36 2013 +0200| [905e1e4b521bd941c038e0d8fc32175a178dc21c] | committer: Carl Eugen Hoyos

Cosmetics: Fix indentation and add braces after last commit.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=905e1e4b521bd941c038e0d8fc32175a178dc21c
---

 libavcodec/vc1dec.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 9e45cdf..bce0b45 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -6007,14 +6007,14 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
     s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
 
     if ((CONFIG_VC1_VDPAU_DECODER)
-        &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+        &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) {
         if (v->field_mode && buf_start_second_field) {
             ff_vdpau_vc1_decode_picture(s, buf_start, buf_start_second_field - buf_start);
             ff_vdpau_vc1_decode_picture(s, buf_start_second_field, (buf + buf_size) - buf_start_second_field);
         } else {
-        ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start);
+            ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start);
         }
-    else if (avctx->hwaccel) {
+    } else if (avctx->hwaccel) {
         if (v->field_mode && buf_start_second_field) {
             // decode first field
             s->picture_structure = PICT_BOTTOM_FIELD - v->tff;



More information about the ffmpeg-cvslog mailing list