FFmpeg/libavformat
Michael Niedermayer ef7e8efc6b Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
  lavf: Avoid setting avg_frame_rate if delta_dts is negative

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:19:13 +02:00
..
2013-06-09 01:10:36 +02:00
2013-06-09 01:10:36 +02:00
2013-07-01 21:37:16 +00:00
2013-09-19 22:04:34 +02:00
2013-06-28 09:04:16 +02:00
2013-08-29 01:57:38 +02:00
2013-06-29 18:02:37 +02:00
2013-09-03 19:34:04 +02:00
2013-06-20 21:49:02 +02:00
2013-09-18 14:10:05 -04:00
2013-09-21 15:36:33 +02:00
2013-07-02 18:52:45 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 03:26:54 +02:00
2013-06-15 18:50:11 -03:00
2013-07-07 18:50:03 +02:00
2013-09-21 15:36:33 +02:00
2013-09-08 12:54:49 +02:00
2013-08-09 23:02:48 +02:00
2013-09-21 15:36:33 +02:00
2013-08-23 20:05:35 +02:00
2013-09-15 22:03:03 -04:00
2013-09-21 15:36:33 +02:00
2013-08-05 10:14:42 +02:00
2013-06-16 18:56:56 +00:00
2013-08-21 05:51:41 +02:00
2013-09-21 15:36:33 +02:00