Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set ref_count to 0 for intra slices.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* qatar/master:
h264: set ref_count to 0 for intra slices.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>