1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer b61170f51d Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'
* commit '1509c018bd5b054a2354e20021ccbac9c934d213':
  mpegts: relax restrictions on matching the packet start in read_header

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 01:59:14 +01:00
..
2014-12-18 00:10:35 +01:00
2014-12-09 19:58:56 +01:00
2014-12-18 00:10:35 +01:00
2015-01-15 17:09:39 +01:00
2015-02-06 20:44:36 +01:00
2015-01-30 09:33:49 +00:00
2014-11-06 09:05:37 +01:00
2015-02-06 20:44:36 +01:00
2014-12-18 23:27:07 +01:00
2014-12-18 23:27:07 +01:00
2014-12-02 11:40:01 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2014-10-22 23:12:38 +02:00
2015-02-09 21:15:27 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00
2014-12-18 00:10:35 +01:00