FFmpeg/libavcodec
Michael Niedermayer 2f980cf39a Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'
* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 15:58:07 +01:00
..
2012-11-26 11:17:17 -05:00
2012-11-24 10:56:47 +00:00
2012-11-24 10:56:47 +00:00
2012-11-24 10:56:47 +00:00
2012-11-12 11:46:12 +00:00
2012-11-23 15:52:12 +01:00
2012-11-30 15:00:35 +00:00
2012-11-07 18:08:23 +01:00
2012-11-23 18:10:02 +01:00
2012-11-23 18:10:02 +01:00
2012-11-18 17:46:45 +00:00
2012-11-23 01:18:53 +01:00
2012-11-18 17:46:45 +00:00
2012-11-25 18:38:12 +01:00
2012-11-28 16:21:25 +00:00
2012-11-04 23:35:09 +00:00
2012-11-25 18:38:12 +01:00
2012-11-16 05:16:34 +01:00
2012-12-01 22:25:50 +01:00