Changeset ffb5a0d5 in ffmpeg

Timestamp:

Apr 30, 2011, 10:26:05 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8556406d

Parents:

1a9f9f81 (diff), 85770f2a (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/30/11 22:21:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/30/11 22:26:05)

Message:

Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'

• commit '85770f2a2651497861ed938efcd0df3696ff5e45': AVOptions: make default_val a union, as proposed in AVOption2. Move ff_dynarray_add to lavu and make it public. lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. options: simplify av_find_opt by using av_next_option.

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

(No files)