Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg4video.c
libavcodec/mpeg4video.h

Simple merge
@@@ -173,18 -174,20 +175,20 @@@ static inline int ff_mpeg4_pred_dc(Mpeg
      /* we assume pred is positive */
      pred = FASTDIV((pred + (scale >> 1)), scale);
  
-     if(encoding){
+     if (encoding) {
          ret = level - pred;
-     }else{
+     } else {
          level += pred;
-         ret= level;
-         if(s->err_recognition&(AV_EF_BITSTREAM|AV_EF_AGGRESSIVE)){
-             if(level<0){
-                 av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y);
+         ret    = level;
 -        if (s->err_recognition & AV_EF_BITSTREAM) {
++        if (s->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) {
+             if (level < 0) {
+                 av_log(s->avctx, AV_LOG_ERROR,
+                        "dc<0 at %dx%d\n", s->mb_x, s->mb_y);
                  return -1;
              }
-             if(level*scale > 2048 + scale){
-                 av_log(s->avctx, AV_LOG_ERROR, "dc overflow at %dx%d\n", s->mb_x, s->mb_y);
+             if (level * scale > 2048 + scale) {
+                 av_log(s->avctx, AV_LOG_ERROR,
+                        "dc overflow at %dx%d\n", s->mb_x, s->mb_y);
                  return -1;
              }
          }