1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer 3e5cd34cd0 Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
* commit '038890740014dc33d2e2f04da7cf0a9da821264e':
  mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 03:11:16 +01:00
..
2013-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-11-25 23:17:17 +01:00
2013-10-30 11:04:06 +00:00
2013-11-22 01:29:02 +01:00
2013-10-30 23:56:52 +01:00
2013-11-16 17:43:05 +01:00
2013-10-31 20:19:59 +01:00
2013-11-16 12:48:25 +01:00
2013-11-16 17:43:36 +01:00
2013-11-16 17:50:51 +01:00
2013-11-16 13:27:17 +01:00
2013-11-26 13:22:01 +01:00
2013-11-22 01:29:02 +01:00
2013-11-22 01:29:02 +01:00
2013-11-22 01:29:02 +01:00
2013-10-28 23:54:28 +01:00
2013-11-23 16:59:05 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:53:06 +01:00
2013-10-30 12:41:43 +00:00
2013-11-21 20:57:20 +01:00
2013-11-16 12:49:18 +01:00
2013-10-28 23:54:28 +01:00
2013-10-22 19:55:47 +02:00
2013-11-05 12:44:20 +00:00
2013-11-21 14:17:00 +01:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00