Merge commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:12:23 +0000 (17:12 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:12:23 +0000 (17:12 +0200)
* commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51':
  lavu: Drop deprecated external access to AVPixFmtDescriptor table

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h

Simple merge
Simple merge
Simple merge