Changeset 702cf8d0 in ffmpeg


Ignore:
Timestamp:
Feb 11, 2015, 12:43:00 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
b61170f5
Parents:
1cca1248 (diff), 6a5b8ca4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'

Conflicts:

libavformat/seek.c
libavformat/seek.h

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

Location:
libavformat
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • libavformat/Makefile

    r1cca1248 r702cf8d0  
    2121       riff.o               \
    2222       sdp.o                \
    23        seek.o               \
    2423       url.o                \
    2524       utils.o              \
  • libavformat/mpegts.c

    r1cca1248 r702cf8d0  
    3535#include "internal.h"
    3636#include "avio_internal.h"
    37 #include "seek.h"
    3837#include "mpeg.h"
    3938#include "isom.h"
Note: See TracChangeset for help on using the changeset viewer.