ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 21
12:44:09 2015 +0100| [7fd732b75825ff5e3dd54bf56c1ab9b74477c93f] | committer:
Michael Niedermayer
Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'
* commit '16163e6bf2d446c06d4dd053c0852074bb50508d':
rtpdec_h264: Fix nal type counting after refactoring
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fd732b75825ff5e3dd54bf56c1ab9b74477c93f
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
