]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #770 in FS/freeswitch from FS-8750-1 to master
authorMike Jerris <mike@jerris.com>
Fri, 25 Mar 2016 15:36:40 +0000 (10:36 -0500)
committerMike Jerris <mike@jerris.com>
Fri, 25 Mar 2016 15:36:40 +0000 (10:36 -0500)
* commit 'bdeacb1d29d78626474bf53cf8969bf3ea20c751':
  FS-8751 [Conference Play Video Total Time and Current Time]
  FS-8748 FS-8751 check current play_status
  FS-8748 track pdf total pages and current page
  FS-8754 add ability to read high quality PDF
  FS-8750 implement file_seek for video files

1  2 
src/include/switch_module_interfaces.h
src/mod/applications/mod_av/avformat.c
src/mod/applications/mod_conference/conference_api.c
src/mod/applications/mod_conference/mod_conference.c
src/mod/applications/mod_conference/mod_conference.h