ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug 12 
16:52:14 2014 +0200| [980aa2ae355d6dc93384d23440ea53c57254a08b] | committer: 
Michael Niedermayer

Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'

* commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a':
  hevc: wait proper position for tmvp

Conflicts:
        libavcodec/hevc_mvs.c

See: ed248e7f70d98abe099392e154d1cdd0f15faa3c
Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=980aa2ae355d6dc93384d23440ea53c57254a08b
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to