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

Les articles publiés sur le site

• Merge commit ’f261e508459e28beca59868a878e1519a44bb678’

  12 juillet 2013, par Michael Niedermayer

  Merge commit 'f261e508459e28beca59868a878e1519a44bb678'
  
  * commit 'f261e508459e28beca59868a878e1519a44bb678':
    dca: Error out on missing DSYNC
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/dcadec.c

• Merge commit ’c82da343e635663605bd81c59d872bee3182da73’

  12 juillet 2013, par Michael Niedermayer

  Merge commit 'c82da343e635663605bd81c59d872bee3182da73'
  
  * commit 'c82da343e635663605bd81c59d872bee3182da73':
    pcm: always use codec->id instead of codec_id
  
  This is not merged as we consistently use codec_id, while libav against what
  the comit message might hint at mixes both in the decoder.
  Its fine to use either but it should be consistent.
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/pcm.c

• Merge commit ’c0d973c41b4568d5bad1295879e35cfa611bdcf2’

  12 juillet 2013, par Michael Niedermayer

  Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
  
  * commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
    vdpau: use the correct namespace for the union
  
  Conflicts:
  	libavcodec/vdpau.h
  
  See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/vdpau.h

• Merge commit ’e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446’

  12 juillet 2013, par Michael Niedermayer

  Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
  
  * commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
    mlpdec: Do not set invalid context in read_restart_header
  
  Conflicts:
  	libavcodec/mlpdec.c
  
  See: a9cd12ee2afb3f3aad783c396816b23d8513f472
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/mlpdec.c

• Merge commit ’2b379a925162b6783bd9a81dc03e647e8b65494c’

  12 juillet 2013, par Michael Niedermayer

  Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
  
  * commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
    mlpdsp: x86: Respect cpuflags
  
  Conflicts:
  	libavcodec/x86/mlpdsp.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/x86/mlpdsp.c