[FFmpeg-cvslog] Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

Michael Niedermayer git at videolan.org
Fri Dec 14 15:57:47 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:53:48 2012 +0100| [be26232efa9543106bfc16f45831f69abaf1c552] | committer: Michael Niedermayer

Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
  ivi_common: use proper logging context in ivi_decode_blocks().
  ivi_common: make some functions and tables static.
  asyncts: ignore min_delta only if first_pts is set

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

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

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





More information about the ffmpeg-cvslog mailing list