FFmpeg/libavcodec
Michael Niedermayer a646ac8ef5 Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'
* commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1':
  avpacket: free side data in av_free_packet().
  v4l2: do not assert on a value received from outside of Libav
  v4l2: set the average framerate instead of codec timebase.

Conflicts:
	libavcodec/avpacket.c
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 14:16:21 +01:00
..
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-01-14 05:05:26 +01:00
2013-01-07 11:43:20 +00:00
2013-01-06 13:31:40 +01:00
2013-01-07 11:43:20 +00:00
2013-01-09 01:08:39 +01:00
2012-12-14 20:58:01 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2012-12-06 19:09:48 +00:00
2012-12-21 00:18:34 +01:00
2012-12-24 04:35:12 +01:00
2012-12-31 19:11:12 +01:00
2012-12-21 00:18:34 +01:00
2012-12-14 01:13:21 +01:00
2012-12-11 20:17:30 +11:00
2013-01-06 16:30:02 +01:00
2013-01-14 05:05:27 +01:00
2013-01-04 04:49:16 +01:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2012-12-31 00:41:35 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2012-12-12 17:46:05 +01:00
2013-01-04 17:06:29 +01:00
2012-12-18 01:58:17 +01:00
2012-12-14 00:31:18 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2012-12-15 11:46:30 +01:00
2013-01-10 04:57:50 +01:00
2013-01-14 05:05:37 +01:00
2013-01-12 14:06:30 +01:00
2013-01-12 14:06:30 +01:00
2012-12-17 20:37:54 +11:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-01-14 05:05:38 +01:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2013-01-10 04:57:50 +01:00
2012-12-21 00:18:34 +01:00
2013-01-14 05:05:39 +01:00
2012-12-21 00:18:34 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-01-11 00:58:40 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 13:31:40 +01:00