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

f1c0c6b7

Commit f1c0c6b7 authored 12 years ago by Michael Niedermayer

Downloads
- Plain Diff

Merge remote-tracking branch 'cigaes/master'


* cigaes/master:
  ffmpeg: use a rational for -aspect option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

parents 6a78ec18 de38e7c8

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

ffmpeg.c 3 additions, 3 deletions

ffmpeg.c
ffmpeg.h 1 addition, 1 deletion

ffmpeg.h
ffmpeg_opt.c 1 addition, 1 deletion

ffmpeg_opt.c

with 5 additions and 5 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