[FFmpeg-cvslog] Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'

Michael Niedermayer git at videolan.org
Sun Mar 1 01:42:03 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 01:31:26 2015 +0100| [78c59f3f0c9f20c3d143bd75fdf125bdf032b16d] | committer: Michael Niedermayer

Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'

* commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2':
  rtpenc: Restructure if statements in packetizers to simplify adding more conditions

Conflicts:
	libavformat/rtpenc_xiph.c

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

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





More information about the ffmpeg-cvslog mailing list