OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9567162 5c3fa74)
Merge commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 00:02:14 +0000 (01:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 00:04:30 +0000 (01:04 +0100)
* commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72':
  hevc: support luma bit depth != chroma bit depth for PCM coding units

Conflicts:
libavcodec/hevc.c

See: 0afa254d4efd3c06fd0194789aefc193c8506947
See: a7e300649a7a2105a4f7edfaf936f0a9e05a2d43
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help