Changeset 19769766 in ffmpeg

Timestamp:

Sep 17, 2013, 2:47:18 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

102a1d92

Parents:

8fc441ce (diff), ea78a34 (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 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'

• commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9': eacmv: Make sure a reference frame exists before referencing it

Conflicts:

libavcodec/eacmv.c

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

(No files)