Michael Niedermayer
5de1f7a7bd
Merge commit '18e6f087c4a50bede8449ee164778945480be50c' ...
* commit '18e6f087c4a50bede8449ee164778945480be50c':
img2: document the options available
hls: improve options description
hls: use a meaningful long name
hls: add start_number option
h264: check for invalid zeros_left before writing
Conflicts:
doc/demuxers.texi
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09 13:35:49 +01:00
2012-10-08 11:22:42 +02:00
2012-12-06 10:09:37 +01:00
2012-11-25 15:01:33 +01:00
2012-11-26 00:43:45 +01:00
2012-12-06 10:16:10 +01:00
2012-12-08 17:04:23 +01:00
2012-12-03 16:31:51 +01:00
2012-11-02 18:28:56 +01:00
2012-11-16 13:07:10 +01:00
2012-11-25 23:17:26 +01:00
2012-08-22 01:03:48 +02:00
2012-11-08 21:05:10 +01:00
2012-09-29 19:27:01 +02:00
2012-09-29 19:27:01 +02:00
2012-11-28 23:51:12 +01:00
2012-12-07 16:16:20 +01:00
2012-11-27 23:35:25 +01:00
2012-12-01 13:06:56 +01:00
2012-12-08 15:17:47 +01:00
2012-11-27 23:35:45 +01:00
2012-12-03 13:49:56 +01:00
2012-11-25 19:21:30 +01:00
2012-11-27 23:35:35 +01:00
2012-11-03 11:01:48 +01:00
2012-11-22 14:19:29 +01:00
2012-09-30 12:22:19 +02:00
2012-11-16 13:07:10 +01:00
2012-11-16 13:07:10 +01:00
2012-11-28 16:43:34 +01:00
2012-12-08 18:26:32 +01:00
2012-12-07 16:15:02 -05:00
2012-11-11 20:43:28 +01:00
2012-11-13 19:44:21 +01:00
2012-11-28 23:51:12 +01:00
2012-11-27 23:35:25 +01:00
2012-11-25 00:28:27 +01:00
2012-11-27 23:35:45 +01:00
2012-11-27 23:35:35 +01:00
2012-11-25 00:28:36 +01:00
2012-11-25 19:21:30 +01:00
2012-11-29 10:19:52 +01:00
2012-11-19 22:24:44 +01:00
2012-12-09 13:35:49 +01:00
2012-10-30 13:52:03 +01:00
2012-10-31 14:02:35 +01:00
2012-07-22 10:31:33 +02:00
2012-11-22 00:46:14 +01:00
2012-09-15 16:26:00 +02:00
2012-10-06 13:55:18 +02:00
2012-10-02 09:43:27 +02:00
2012-10-31 00:37:42 +01:00
2012-10-29 11:56:15 +01:00
2012-10-09 13:06:04 +02:00
2012-11-17 19:47:56 +01:00
5de1f7a7bd