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

0e3e3656

Commit 0e3e3656 authored 9 years ago by Derek Buitenhuis

Downloads
- Plain Diff

Merge commit '12b49769'


* commit '12b49769':
  lavc: Move mpeg_quant to codec private options

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

parents b986a462 12b49769

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

libavcodec/avcodec.h 4 additions, 5 deletions

libavcodec/avcodec.h
libavcodec/libxvid.c 10 additions, 0 deletions

libavcodec/libxvid.c
libavcodec/mpegvideo.h 1 addition, 0 deletions

libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c 7 additions, 1 deletion

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

libavcodec/options_table.h

with 24 additions and 6 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