aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-26 14:07:03 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-26 14:07:03 +0100
commit438ed974b832634c544facaf6de3a23e9e7d774a (patch)
treee64ec8adb4d53435a816df57839693a44a7a690d /ffmpeg.c
parentb5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c (diff)
parentb667252a41fbf5a3f6ea8c67fdbc03db3d748977 (diff)
downloadffmpeg-438ed974b832634c544facaf6de3a23e9e7d774a.tar.gz
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977': h2645_parse: add support for parsing h264 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions