Changeset e7724f34 in ffmpeg

Timestamp:

Feb 5, 2014, 12:42:06 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cd04f0da

Parents:

d80b9ea (diff), 54308391 (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 '5430839144c6da0160e8e0cfb0c8db01de432e94'

• commit '5430839144c6da0160e8e0cfb0c8db01de432e94': eacmv: clear references on frame dimensions change

Conflicts:

libavcodec/eacmv.c

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

(No files)