[FFmpeg-cvslog] Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 15:57:23 2013 +0100| [b36095ea0f668e2b7aac33643a6a33d03433a418] | committer: Michael Niedermayer

Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'

* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  xxan: fix invalid memory access in xan_decode_frame_type0()
  tty: set avg_frame_rate.
  FATE: enable multiple slices in the ffv1 vsynth test

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

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