FFmpeg/libavcodec
Michael Niedermayer 7c425e4f2d Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'
* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
  h264: check sps.log2_max_frame_num for validity
  mov: validate number of DataReferenceBox entries against box size
  mov: compute avg_frame_rate only if duration is known
  flac: change minimum and default of lpc_passes option to 1

Conflicts:
	libavcodec/h264_ps.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07 15:52:43 +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-10-09 04:00:55 +02:00
2012-11-24 10:56:47 +00:00
2012-10-14 05:48:02 +02:00
2012-11-23 15:52:12 +01:00
2012-12-06 19:09:48 +00:00
2012-11-30 15:00:35 +00:00
2012-11-07 18:08:23 +01:00
2012-10-21 18:22:50 +02:00
2012-11-23 18:10:02 +01:00
2012-12-05 19:31:27 +01:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-11-23 18:10:02 +01:00
2012-10-18 21:42:04 +02:00
2012-11-18 17:46:45 +00:00
2012-10-12 01:44:35 +02:00
2012-11-23 01:18:53 +01:00
2012-11-25 18:38:12 +01:00
2012-10-14 21:45:42 +02:00
2012-11-28 16:21:25 +00:00
2012-10-13 16:02:09 +00:00
2012-11-04 23:35:09 +00:00
2012-10-25 01:38:15 +02:00
2012-11-16 05:16:34 +01:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-27 04:32:40 +02:00
2012-10-15 13:28:23 +00:00