ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Jul 11
11:42:05 2014 +0200| [f351afb5f9dedc33260b8811223dc39c81bbcec3] | committer:
Michael Niedermayer
Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'
* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
hevc_ps: remove a write-only variable
Conflicts:
libavcodec/hevc_ps.c
See: ba70563d5549fdbde4c254c9334a123c439ccc30
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f351afb5f9dedc33260b8811223dc39c81bbcec3
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
