Merge commit '46430fd4'

* commit '46430fd4':
  vc1dec: Don't attempt error concealment on field pictures
  vc1dec: fieldtx is only valid for interlaced frame pictures
  aacenc: Fix erasure of surround channels
  aacenc: Fix target bitrate for twoloop quantiser search

Conflicts:
	libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/vc1dec.c

@@ -6140,7 +6140,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
 //      return -1;
         if(s->er.error_occurred && s->pict_type == AV_PICTURE_TYPE_B)
             goto err;
-        if(!v->field_mode)
+        if (!v->field_mode)
             ff_er_frame_end(&s->er);
     }