ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Oct 21
22:48:19 2014 +0200| [840bc8e284c8eead7f0f319e846f911dfb3fd48f] | committer:
Michael Niedermayer
Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'
* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
rmdec: check av_new_packet return value
Conflicts:
libavformat/rmdec.c
See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=840bc8e284c8eead7f0f319e846f911dfb3fd48f
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
