[FFmpeg-cvslog] Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'

Michael Niedermayer git at videolan.org
Wed Mar 4 11:33:21 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  4 11:15:05 2015 +0100| [5dce723715e1f9514808f9c788b28734004f089d] | committer: Michael Niedermayer

Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'

* commit '2a66a580678dd9401f4d95e01e0958ca51864b6f':
  rtpdec_mpa_robust: Fix incrementing split_pos

Conflicts:
	libavformat/rtpdec_mpa_robust.c

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

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





More information about the ffmpeg-cvslog mailing list