[FFmpeg-cvslog] Merge commit	'3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
    Michael Niedermayer 
    git at videolan.org
       
    Mon Jun  1 00:34:09 CEST 2015
    
    
  
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 00:24:45 2015 +0200| [61e1287551cd912b9744b7ffa813686afa1f97e2] | committer: Michael Niedermayer
Merge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
* commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c':
  vp9: Parse subsampling and report missing feature
Conflicts:
	libavcodec/vp9.c
	libavcodec/vp9.h
No change as FFmpeg already supports subsampling
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61e1287551cd912b9744b7ffa813686afa1f97e2
---
    
    
More information about the ffmpeg-cvslog
mailing list