1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer 69fd0b7adb Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'
* commit '71f7b22dba60524b2285643ae0b49d8f64977129':
  ffv1: split decoder and encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/ffv1.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21 14:37:15 +02:00
..
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-10-13 00:31:21 +02:00
2012-10-14 05:48:02 +02:00
2012-10-18 20:29:03 +02:00
2012-10-12 17:58:15 +02:00
2012-10-14 03:42:28 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 00:08:02 +00:00
2012-10-18 21:42:04 +02:00
2012-10-21 14:26:23 +02:00
2012-10-12 01:44:35 +02:00
2012-10-14 21:45:42 +02:00
2012-10-13 08:22:26 +00:00
2012-10-13 16:02:09 +00:00
2012-10-15 15:09:46 +02:00
2012-10-19 03:36:42 +02:00
2012-10-12 18:17:10 +03:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00