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

Les articles publiés sur le site

• avformat/avio : Fix EOF handiling of ffurl_read_complete()

  24 juin 2013, par Michael Niedermayer

  avformat/avio: Fix EOF handiling of ffurl_read_complete()
  
  Fixes Ticket2537
  
  Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/avio.c

• avio : Handle AVERROR_EOF in the same way as the return value 0

  24 juin 2013, par Michael Niedermayer

  avio: Handle AVERROR_EOF in the same way as the return value 0
  
  This makes sure the ffurl_read_complete function actually
  returns the number of bytes read, as the documentation of the
  function says, even if the underlying protocol uses AVERROR_EOF
  instead of 0.
  
  Signed-off-by: Martin Storsjö <martin@martin.st>
  

  • [DH] libavformat/avio.c

• Merge remote-tracking branch ’qatar/master’

  24 juin 2013, par Michael Niedermayer

  Merge remote-tracking branch 'qatar/master'
  
  * qatar/master:
    lavf: don't abort if both encoder and muxer aspect ratios are not set
  
  Conflicts:
  	libavformat/mux.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/mux.c

• Merge commit ’c3e58f8fb75d8467161a65b85eb88281547ebab1’

  24 juin 2013, par Michael Niedermayer

  Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1'
  
  * commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
    matroskaenc: restore compatibility with non referenced AVPacket
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/matroskaenc.c

• Merge commit ’95d52464542f532061290192518d5fe1c1930e8d’

  24 juin 2013, par Michael Niedermayer

  Merge commit '95d52464542f532061290192518d5fe1c1930e8d'
  
  * commit '95d52464542f532061290192518d5fe1c1930e8d':
    lavc: Add option to encode MPEG-2 AAC with libfdk-aac
  
  Conflicts:
  	doc/APIchanges
  	libavcodec/version.h
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] doc/APIchanges
  • [DH] libavcodec/avcodec.h
  • [DH] libavcodec/libfdk-aacenc.c
  • [DH] libavcodec/options_table.h
  • [DH] libavcodec/version.h