diff options
author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:30:16 +0200 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:30:16 +0200 |
commit | 14762dd3f3bb8c38a47033ce054058bcf9d30b08 (patch) | |
tree | 6ab11304206a846f384d58df50f41046c9d03779 /libavutil/hwcontext_cuda.c | |
parent | c01f1157acbec4274a38a728cf7fa9731ef23d82 (diff) | |
parent | 015c2d923902fcd562571993eaf1231ce388c7f0 (diff) | |
download | ffmpeg-14762dd3f3bb8c38a47033ce054058bcf9d30b08.tar.gz |
Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'
* commit '015c2d923902fcd562571993eaf1231ce388c7f0':
libopencore-amr: Fix ff_dlog()/av_log() invocations
The log changed in our tree in 4a289624545c559107fac93597b23289a8b15c9f
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavutil/hwcontext_cuda.c')
0 files changed, 0 insertions, 0 deletions