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

94eadee7

Commit 94eadee7 authored 14 years ago by Michael Niedermayer

Downloads
- Patches
- Plain Diff

Merge/split side data.


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

parent 007f7739

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

libavcodec/avcodec.h 5 additions, 0 deletions

libavcodec/avcodec.h
libavcodec/avpacket.c 80 additions, 1 deletion

libavcodec/avpacket.c
libavcodec/utils.c 2 additions, 2 deletions

libavcodec/utils.c
libavformat/utils.c 2 additions, 0 deletions

libavformat/utils.c

with 89 additions and 3 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