ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Apr 29 
03:32:47 2015 +0200| [77010a41fef047bff53536387db7fa043495bb6c] | committer: 
Michael Niedermayer

Merge commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b'

* commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b':
  flacenc: Move a scratch buffer to struct used by the function

Conflicts:
        libavcodec/flacenc.c

Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77010a41fef047bff53536387db7fa043495bb6c
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to