FFmpeg/libavcodec
Michael Niedermayer b4ca1b159f Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
  Remove libmpeg2 #define remnants
  De-doxygenize some top-level files

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 15:01:39 +02:00
..
2012-10-08 02:09:28 +02:00
2012-10-09 04:00:55 +02:00
2012-10-08 09:06:25 +00:00
2012-10-12 20:56:54 +02:00
2012-09-21 01:03:31 +02:00
2012-10-08 09:06:25 +00:00
2012-10-13 00:31:21 +02:00
2012-10-13 00:31:21 +02:00
2012-09-04 18:37:54 +03:00
2012-10-12 17:58:15 +02:00
2012-09-07 12:36:00 +02:00
2012-09-30 14:05:04 +00:00
2012-10-09 16:48:43 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-09-03 23:26:14 +02:00
2012-10-12 01:44:35 +02:00
2012-10-03 16:14:59 +02:00
2012-10-13 08:22:26 +00:00
2012-10-13 08:22:27 +00:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-09-18 17:37:41 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-12 18:17:10 +03:00
2012-09-30 13:39:38 +00:00
2012-10-10 16:48:13 +00:00
2012-09-23 15:24:08 +02:00