[FFmpeg-cvslog] Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'

Michael Niedermayer git at videolan.org
Tue Nov 4 21:08:53 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  4 21:01:39 2014 +0100| [a28313b09e73d8e908223027909e9b836a3c0fa5] | committer: Michael Niedermayer

Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'

* commit '351d0f8b7a6ecce411ae75fb3511573c34317218':
  get_bits: remove unused assignment

Conflicts:
	libavcodec/get_bits.h

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

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





More information about the ffmpeg-cvslog mailing list