]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec1d8ab 9d4d9be)
Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:26:18 +0000 (19:26 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:26:22 +0000 (19:26 +0100)
* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
  libavcodec: Document that encoders may use the framerate field in AVCodecContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/avcodec.h patch | diff1 | diff2 | blob | history

diff --cc libavcodec/avcodec.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.