-
Michael Niedermayer authored
* commit '7bbc254d': h264: move resync_mb_{x,y} into the per-slice context Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
72bec029
* commit '7bbc254d': h264: move resync_mb_{x,y} into the per-slice context Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>