[FFmpeg-cvslog] Merge commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3'

Michael Niedermayer git at videolan.org
Sun Feb 22 01:57:54 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 22 01:48:53 2015 +0100| [abf357a9fb2f19467bad8e3e629f8b016091eedf] | committer: Michael Niedermayer

Merge commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3'

* commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3':
  rtpdec_mpeg4: add more verbose error logging

Conflicts:
	libavformat/rtpdec_mpeg4.c

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

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





More information about the ffmpeg-cvslog mailing list