OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 541e1c2 e4b3887)
Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:57:11 +0000 (19:57 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:57:11 +0000 (19:57 +0200)
* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
  Move check_marker() from get_bits to mpeg4videodec

Not merged, check_marker() is used in various other places in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>

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