[FFmpeg-cvslog] Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

Michael Niedermayer git at videolan.org
Mon Dec 10 02:05:08 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 10 01:32:37 2012 +0100| [b7d8484f272b7a5a2ed9db76d5182dbd6e3e6992] | committer: Michael Niedermayer

Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list