[FFmpeg-cvslog] Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 09:49:17 2013 +0200| [b602e47f12d72b383d986d66212341af31c9bc82] | committer: Michael Niedermayer

Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'

* commit '46430fd47c6239ef8742d0a34f9412d5060fa798':
  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 at gmx.at>

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