ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug 12
16:19:32 2014 +0200| [cde2de4a05dc5959f1ae10a92879a2244f25b4fd] | committer:
Michael Niedermayer
Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'
* commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b':
hevc: derive partially amvp list
Conflicts:
libavcodec/hevc_mvs.c
See: bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938
See: 3ad046083119abd3b063964bd79797e9935305e1
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde2de4a05dc5959f1ae10a92879a2244f25b4fd
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
