[FFmpeg-cvslog] Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 14:39:15 2012 +0100| [e84194f06024892fc33684c5a1726c97a0c0a45c] | committer: Michael Niedermayer

Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'

* commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937':
  ff_h264_direct_ref_list_init: fix B slice check.
  h264: increase dist_scale_factor for up to 32 references

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

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