Changeset 702cf8d0 in ffmpeg

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'

• commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c': lavf: remove unused code

Conflicts:

libavformat/seek.c
libavformat/seek.h

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

(No files)