[FFmpeg-cvslog] Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'

Michael Niedermayer git at videolan.org
Tue Mar 12 22:47:05 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 22:38:55 2013 +0100| [db594f65ec4e4a8d85113f309f3d9c31959b48e3] | committer: Michael Niedermayer

Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'

* commit '845017105f240ac5348aad1f8a5256b86d49db76':
  lavc: remove disabled FF_API_DSP_MASK cruft
  lavc: remove disabled FF_API_SUB_ID cruft

Conflicts:
	libavcodec/options_table.h
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list