1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 72bec029ee Merge commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979'
* commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979':
  h264: move resync_mb_{x,y} into the per-slice context

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 16:54:48 +01:00
..
2015-03-06 14:37:44 +01:00
2015-03-20 02:38:20 -03:00
2015-03-10 23:33:57 +01:00
2015-03-03 13:57:42 +01:00
2015-03-03 13:57:42 +01:00
2015-03-20 00:25:50 +01:00
2015-03-14 14:05:25 +01:00
2015-03-02 19:32:23 +01:00
2015-03-20 02:17:31 +01:00
2015-03-20 00:25:50 +01:00
2015-03-16 13:04:47 +01:00
2015-03-15 02:57:24 +01:00