ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 21
12:56:08 2015 +0100| [a10529a3191763c8cf3e7f8bd0ba62a101e2fd3c] | committer:
Michael Niedermayer
Merge commit '0de07510844517b615ef2a2e2916f6391ad88687'
* commit '0de07510844517b615ef2a2e2916f6391ad88687':
rtpdec_h264: Make reusable functions non-static
Conflicts:
libavformat/rtpdec_formats.h
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a10529a3191763c8cf3e7f8bd0ba62a101e2fd3c
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
