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

c4e88217

Commit c4e88217 authored 12 years ago by Michael Niedermayer

Downloads
- Plain Diff

Merge commit '7ecc2d40'


* commit '7ecc2d40':
  Move AVFrame from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h

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

parents fee484ed 7ecc2d40

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

libavcodec/avcodec.h 1 addition, 443 deletions

libavcodec/avcodec.h
libavcodec/internal.h 0 additions, 2 deletions

libavcodec/internal.h
libavcodec/tiff.c 4 additions, 4 deletions

libavcodec/tiff.c
libavcodec/utils.c 1 addition, 13 deletions

libavcodec/utils.c
libavutil/Makefile 2 additions, 0 deletions

libavutil/Makefile
libavutil/frame.c 417 additions, 0 deletions

libavutil/frame.c
libavutil/frame.h 526 additions, 0 deletions

libavutil/frame.h

with 951 additions and 462 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