summaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-17 13:55:39 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-17 13:55:39 +0100
commit079b5d4ef888bd42bf0147a6d964b8bc9ec0f3c5 (patch)
tree7db47f770ed1487fc1229e8b6f47f05641da47aa /libavcodec/Makefile
parentf95385dd580604aa287b41093edd692f34c7613b (diff)
parent8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca (diff)
downloadffmpeg-streaming-079b5d4ef888bd42bf0147a6d964b8bc9ec0f3c5.zip
ffmpeg-streaming-079b5d4ef888bd42bf0147a6d964b8bc9ec0f3c5.tar.gz
Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'
* commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca': mpegenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud