Andy Bauer
|
549360cabd
|
Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements
Conflicts:
src/zm_ffmpeg.h
src/zm_mpeg.cpp
|
2014-10-11 15:38:38 -05:00 |
m-bene
|
a81b9b8ce2
|
change examples for options
|
2014-05-17 21:48:08 +02:00 |
|
m-bene
|
f62afdb8cc
|
add select list for rtsp method for ffmpeg and libvlc
|
2014-05-17 20:41:22 +02:00 |
|
m-bene
|
9a71a0068a
|
add help window for ffmpeg/libvlc options
|
2014-05-17 04:33:33 +02:00 |
|
m-bene
|
1b4f9c082c
|
change check for av_dict_set success
|
2014-05-15 16:01:29 +02:00 |
|
m-bene
|
6016206f98
|
modify debug message
|
2014-05-15 15:42:27 +02:00 |
|
m-bene
|
5cb7cd916f
|
add quotes to option debug/warn messages
|
2014-05-15 15:13:39 +02:00 |
|
m-bene
|
c1557a99e5
|
add debug and warn messages
|
2014-05-15 15:06:01 +02:00 |
|
m-bene
|
ae0ee9b3b3
|
testing/fixing
|
2014-05-05 15:54:13 +02:00 |
|
m-bene
|
ceff5a98ea
|
add generic Option field to ffmpeg and libvlc cameras
|
2014-05-05 13:29:12 +02:00 |
Sune1337
|
3155d621d0
|
- Removed an unreferenced variable
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
|
2014-04-25 22:57:29 +02:00 |
nextime
|
33cbd89212
|
Migrate svn to git
|
2013-03-17 00:45:21 +01:00 |