ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Apr 3
21:37:03 2015 +0200| [41dde62d7f4121495150fe0e0db26fc25c737901] | committer:
Michael Niedermayer
Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'
* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
hevc: do not change the VPS if its contents are the same
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41dde62d7f4121495150fe0e0db26fc25c737901
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
