Changeset 15fe694e in ffmpeg

Timestamp:

Mar 24, 2014, 2:32:48 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c31b3e38

Parents:

1034fbdf (diff), b4679ecd (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 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'

• commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab': {v,a}f_showinfo: print frame side data

Conflicts:

libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

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

(No files)