ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Feb 25
00:40:58 2015 +0100| [7d9b06eb179fb0d032c530d21182dce3fe0a7671] | committer:
Michael Niedermayer
Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'
* commit '199fb40278146c5bb162990c66ad3cd561abc780':
rtpdec: Use ffio_free_dyn_buf
Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d9b06eb179fb0d032c530d21182dce3fe0a7671
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
