Skip to content

V
vlc-1.1
Switch branch/tag
  1. 08 Jul, 2011 2 commits
  3. 07 Jul, 2011 3 commits
  5. 06 Jul, 2011 1 commit
  7. 05 Jul, 2011 2 commits
  9. 04 Jul, 2011 1 commit
  11. 03 Jul, 2011 1 commit
  13. 27 Jun, 2011 3 commits
    • Jean-Baptiste Kempf's avatar
      Qt4: add the browsed folder to the device combo · 15f4f967
      Jean-Baptiste Kempf authored 
      (cherry picked from commit af6a6b2b5b918b55e93083889f72cf970770e82d)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
      15f4f967
    • Ashok Bhat's avatar
      Fixed bugs in AVI mux module · b0c5a17d
      Ashok Bhat authored 
      Closes #21 (partly, at least), #4288 and #4304

Description
===================
Fixed bugs in AVI mux to support creation of AVI files with following popular video/audio combinations
(a) MPEG4 video (aka XVID) with MP3/AC3/PCM Audio
(b) MJPEG video with PCM audio.
AVI as such is not used for storing other formats like H.264, AAC etc

Bug fix details
===================
(a) 'hdrl' list size was wrong. It incorrectly included some parts of MOVI list, size taken by hdrl LIST tag and its size and Size of 'RIFF', File size and 'AVI ' type.
(b) Block Align was set to 0 in case of MP3/AC3. It has to be non-zero. It has to been set to 1.
(c) XVID video decoders expect header to present as part of first frame. Added code to append header present at end of BITMAPINFOHEADER to beginning of the first video frame in case of XVID video.
(d) nAvgBytesPerSec of Waveformatex was not properly being set in case of PCM audio.
(e) Last index entry value was set to garbage due to incorrect index size calculation.

Test PC configuration
===================
Tested with Windows Media Player 11 installed on Windows XP Service pack 3 machine with following directshow filters installed
(a) XVID MPEG4 video decoder filter for MPEG4 video decoding
(b) LAME MP3 codec for MP3 audio decoding

Combinations tested
====================
(a) MPEG4/MP3 transcode
vlc -I dummy "Mr_MrsSmith-h264_aac.mp4" :sout="#transcode{vcodec=mp4v,vb=1024,fps=25,acodec=mpga,ab=128}:standard{mux=avi,access=file,dst=out.avi}" vlc://quit

(b) MPEG4/AC3 transcode
vlc -I dummy "Mr_MrsSmith-h264_aac.mp4" :sout="#transcode{vcodec=mp4v,vb=1024,fps=25,acodec=a52, ab=128}:standard{mux=avi,access=file,dst=out.avi}" vlc://quit

(c) MPEG4/PCM(16bit) transcode
vlc -I dummy "Mr_MrsSmith-h264_aac.mp4" :sout="#transcode{vcodec=mp4v,vb=1024,fps=25,acodec=s16l}:standard{mux=avi,access=file,dst=out.avi}" vlc://quit

(d) MPEG4/PCM(24 bit) transcode
vlc -I dummy "Mr_MrsSmith-h264_aac.mp4" :sout="#transcode{vcodec=mp4v,vb=1024,fps=25,acodec=s24l}:standard{mux=avi,access=file,dst=out.avi}" vlc://quit

(e) MPEG4/PCM(32bit) transcode
vlc -I dummy "Mr_MrsSmith-h264_aac.mp4" :sout="#transcode{vcodec=mp4v,vb=1024,fps=25,acodec=s32l}:standard{mux=avi,access=file,dst=out.avi}" vlc://quit

(f) MJPEG/PCM(32bit) transcode
vlc -I dummy "Mr_MrsSmith-h264_aac.mp4" :sout="#transcode{vcodec=mjpeg,vb=1024,fps=25,acodec=s32l}:standard{mux=avi,access=file,dst=out.avi}" vlc://quitSigned-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 1e6d1f3cb3d0ee4b36a939b17eb3a1de2131d34d)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
      b0c5a17d
    • Rémi Denis-Courmont's avatar
      Mark srtp-key and srtp-salt safe · 219806e4
      Rémi Denis-Courmont authored 
      (cherry picked from commit 73cadb239d790835d81a83e53069fbe768a2d260)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
      219806e4
  15. 22 Jun, 2011 1 commit
  17. 21 Jun, 2011 2 commits
  19. 20 Jun, 2011 4 commits
  21. 18 Jun, 2011 7 commits
  23. 16 Jun, 2011 4 commits
  25. 13 Jun, 2011 1 commit
  27. 12 Jun, 2011 1 commit
  29. 11 Jun, 2011 2 commits
  31. 09 Jun, 2011 1 commit
  33. 08 Jun, 2011 4 commits