1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavcodec
Michael Niedermayer 1fad547cef Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'
* commit '54974c62982ae827becdbdb9b620b7ba75d079a0':
  error_resilience: decouple ER from MpegEncContext

Conflicts:
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 18:54:56 +01:00
..
2013-02-06 10:21:52 +01:00
2013-01-23 11:21:09 +00:00
2013-01-21 10:24:45 +00:00
2013-01-23 11:21:09 +00:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-09 01:08:39 +01:00
2013-01-21 10:24:45 +00:00
2013-01-22 18:32:56 -08: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-02-16 13:13:18 +01:00
2013-01-14 22:59:05 +01: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-01-12 14:06:30 +01:00
2013-02-09 14:22:29 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-02-14 23:45:48 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 13:12:49 +02:00
2013-02-09 21:21:26 +01:00
2013-01-23 05:25:04 +01:00
2013-01-24 14:15:55 +01:00