highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'

Browse Source 
* commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa':
  lavc: allow using AVCodecContext.hw_frames_ctx for decoding

Conflicts:
    doc/APIchanges
    libavcodec/version.h

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2016-09-28 13:22:00 -03:00
parent 0153cc49b2 e85f6f7f8d
commit 32c25f06b7
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first:
2016-09-xx - xxxxxxx - lavc 57.59.100/ 57.23.0 - avcodec.h
AVCodecContext.hw_frames_ctx now may be used by decoders.
2016-09-27 - xxxxxxx - lavf 57.51.100 - avformat.h
Add av_stream_get_codec_timebase()