1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer 533bc4c0a3 Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
  er: move relevant fields from Picture to ERPicture

Conflicts:
	libavcodec/error_resilience.c
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 05:08:46 +01:00
..
2014-02-12 13:13:17 +00:00
2014-02-17 20:50:33 +01:00
2014-01-09 19:33:07 +01:00
2013-12-15 16:53:32 +01:00
2014-02-16 21:13:02 +01:00
2014-02-07 19:32:16 +00:00
2014-02-18 18:11:23 +01:00
2014-02-06 02:51:19 +01:00
2014-01-02 22:07:09 +01:00
2013-12-22 22:03:47 +01:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2014-01-31 18:34:14 +01:00
2014-03-11 09:56:38 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-02-22 18:29:17 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2014-03-17 04:35:48 +01:00
2013-12-22 14:59:31 +01:00
2014-01-27 20:36:42 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00