1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 56efd98a65 Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
  On2 AVC decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23 20:47:13 +02:00
..
2014-04-22 14:01:53 +02:00
2014-04-22 20:44:31 +02:00
2014-04-22 02:38:03 +02:00
2014-04-22 20:08:30 +02:00
2014-04-22 20:44:31 +02:00
2014-04-22 20:44:31 +02:00
2014-04-22 20:08:30 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-12 05:40:37 +02:00
2014-04-20 17:02:16 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-04-22 20:44:31 +02:00
2014-04-12 15:41:00 +02:00
2014-04-23 13:31:22 -04:00
2014-04-14 17:43:19 +02:00
2014-04-22 20:44:31 +02:00
2014-04-04 04:00:11 +02:00
2014-03-26 04:20:52 +01:00
2014-04-22 20:44:31 +02:00
2014-03-31 01:11:16 +02:00
2014-04-18 12:41:17 -04:00
2014-04-01 13:43:44 +02:00
2014-04-22 20:44:31 +02:00
2014-04-20 17:32:17 +02:00
2014-04-18 15:19:09 +02:00
2014-04-16 19:45:43 +02:00
2014-03-29 18:13:15 +01:00
2014-04-20 17:35:19 +02:00
2014-04-22 02:41:05 +02:00
2014-03-27 23:57:51 +01:00