Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 13:39:15 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 13:39:30 +0000 (14:39 +0100)
* 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@gmx.at>
1  2 
libavcodec/h264.h
libavcodec/h264_direct.c

Simple merge
Simple merge