[FFmpeg-cvslog] Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 09:45:43 2013 +0200| [772c801c7db9ef2979356059099661d5159daeea] | committer: Michael Niedermayer

Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'

* commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76':
  aacenc: Fix a rounding bug in aacpsy channel bitrate computation
  yadif: correct strides in filter_edges_16bit
  yadif: restore speed of the C filtering code

Conflicts:
	libavfilter/x86/vf_yadif_init.c

No change as these commits where already in FFmpeg

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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