[FFmpeg-cvslog] Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'

Michael Niedermayer git at videolan.org
Mon Dec 9 19:58:42 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 18:58:41 2013 +0100| [7a901eb33af6a079d0ce4045c64eda858884f861] | committer: Michael Niedermayer

Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'

* commit '37a749012aaacc801fe860428417a6d7b81c103f':
  lavc: rework handling of refcounted_frames=0

Conflicts:
	libavcodec/utils.c

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

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





More information about the ffmpeg-cvslog mailing list