git.videolan.org Git - ffmpeg.git/rss log

Les articles publiés sur le site

• rtmp : Unbreak get_packet

  20 septembre 2013, par Luca Barbato

  rtmp: Unbreak get_packet
  
  Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
  

  • [DH] libavformat/rtmpproto.c

• Merge commit ’09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9’

  20 septembre 2013, par Michael Niedermayer

  Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'
  
  * commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9':
    asfenc: remember send time and offset of the index entries
  
  Conflicts:
  	libavformat/asfenc.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/asf.h
  • [DH] libavformat/asfenc.c

• Merge commit ’1eb932803037a3c9f98f66aeb80024dfa3c5c743’

  20 septembre 2013, par Michael Niedermayer

  Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'
  
  * commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
    asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/asf.c
  • [DH] libavformat/asf.h

• Merge commit ’c53b5dda352452e79a9e962cd4c74c813186d9ed’

  20 septembre 2013, par Michael Niedermayer

  Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'
  
  * commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed':
    asfdec: replace magic constant with DATA_HEADER_SIZE
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/asfenc.c

• Merge commit ’5f408333601a827054335f309defcb246a532b21’

  20 septembre 2013, par Michael Niedermayer

  Merge commit '5f408333601a827054335f309defcb246a532b21'
  
  * commit '5f408333601a827054335f309defcb246a532b21':
    asfdec: substract preroll time from marker presentation time
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/asfdec.c