Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FFmpeg
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

13be46c0

Commit 13be46c0 authored 9 years ago by Derek Buitenhuis

Downloads
- Plain Diff

Merge commit '0ac9f33a'


* commit '0ac9f33a':
  lavc: Move frame_skip_* to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

parents 4f32ccb6 0ac9f33a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

libavcodec/avcodec.h 10 additions, 20 deletions

libavcodec/avcodec.h
libavcodec/libvpxenc.c 9 additions, 1 deletion

libavcodec/libvpxenc.c
libavcodec/mpegvideo.c 1 addition, 1 deletion

libavcodec/mpegvideo.c
libavcodec/mpegvideo.h 27 additions, 0 deletions

libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c 20 additions, 7 deletions

libavcodec/mpegvideo_enc.c
libavcodec/options_table.h 2 additions, 0 deletions

libavcodec/options_table.h

with 69 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment