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

Les articles publiés sur le site

• riff : add 0x64 to g726

  3 septembre 2013, par Compn

  riff: add 0x64 to g726
  
  Sample-Id: g726-test1.wav
  

  • [DH] libavformat/riff.c

• Merge commit ’fab694dd3931b1c0bc3c598c3f88b1902c14a303’

  3 septembre 2013, par Michael Niedermayer

  Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'
  
  * commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
    lavf: move a variable declaration to the block where it's used
  
  Conflicts:
  	libavformat/utils.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/utils.c

• Merge commit ’fe9bb61f9a16be19ad91875632c39e44b7a99a8a’

  3 septembre 2013, par Michael Niedermayer

  Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'
  
  * commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a':
    pictordec: pass correct context to avpriv_request_sample
  
  Conflicts:
  	libavcodec/pictordec.c
  
  No change as the avpriv_request_sample() has already been replaced by an implementation
  of the codepath.
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

• Merge commit ’5f7aecde02a95451e514c809f2794c1deba80695’

  3 septembre 2013, par Michael Niedermayer

  Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'
  
  * commit '5f7aecde02a95451e514c809f2794c1deba80695':
    pictordec: break out of both decoding loops when y drops below 0
  
  Conflicts:
  	libavcodec/pictordec.c
  
  The added check is redundant.
  It shows the error path more clearly though
  
  See: f3f488423a12af9bb4eed6e6868cfa86ece3571b
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/pictordec.c

• avcodec/vcr1 : replace redundant checks from libav (8aba7968dd604aae91ee42cbce0be3dad7...

  3 septembre 2013, par Michael Niedermayer

  avcodec/vcr1: replace redundant checks from libav (8aba7968dd604aae91ee42cbce0be3dad7dceb30)  by asserts
  
  Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/vcr1.c