ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Feb 25
00:03:52 2015 +0100| [d52bf89d21b744344cf6cda1bfe156786f24772a] | committer:
Michael Niedermayer
Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'
* commit '78791c086bcaf9eb084c27555b31fea8bbb7624a':
rtpdec: Use .init instead of .alloc to set default values
Conflicts:
libavformat/rdt.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d52bf89d21b744344cf6cda1bfe156786f24772a
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
