OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df3484f 763d69b)
Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'
authorClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 09:06:04 +0000 (11:06 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 09:06:04 +0000 (11:06 +0200)
commite6247a22c0238a73024f29bcced8ae828fe3b39a
tree28cd7ac186ac8d5c0bfbf73e5a937072ea258b3etree | snapshot
parentdf3484f87c4ddec548676a9eb38e6fc69aaceea6commit | diff
parent763d69bfb2f0094e99f43e657cfd2b0471361f6bcommit | diff
Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'

* commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b':
  Add some more deprecation guards

- psnr() deprecation is not merged within ffmpeg.c as we still use it in
  non-deprecated code

- the XVMC chunk is not merged as we still apparently maintain it

- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/qtrleenc.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help