1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer fe54f6cb45 Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
  h264: Copy h264chroma dsp context to slice thread copies
  swscale: Disallow conversion to GBRP16

Conflicts:
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 13:18:28 +01:00
..
2013-02-06 10:21:52 +01:00
2013-01-23 11:21:09 +00:00
2013-02-10 14:44:00 +01:00
2013-01-23 11:21:09 +00:00
2013-02-11 11:04:52 +00:00
2013-02-05 00:37:20 +01:00
2013-01-23 11:21:09 +00:00
2013-01-25 12:54:15 +00:00
2013-01-31 04:21:26 +01:00
2013-01-29 19:11:28 +01:00
2013-01-29 11:01:19 +11:00
2013-01-31 00:02:17 +01:00
2013-01-23 19:39:42 +01:00
2013-01-23 19:39:42 +01:00
2013-01-24 01:47:20 +01:00
2013-02-03 13:08:36 +01:00
2013-02-06 16:46:23 +01:00
2013-02-09 14:22:29 +01:00
2013-02-09 19:32:43 +00:00
2013-02-09 21:21:26 +01:00
2013-01-23 05:25:04 +01:00
2013-01-30 23:12:57 +01:00
2013-01-24 14:15:55 +01:00