]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f72dfe 167ea1f)
Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:37:50 +0000 (10:37 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:37:50 +0000 (10:37 +0200)
* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd':
  xavs: Do not try to set the bitrate tolerance without a bitrate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/libxavs.c patch | diff1 | diff2 | blob | history

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