Changeset b1fad7ac in ffmpeg

Timestamp:

Jul 20, 2015, 9:43:05 PM (9 years ago)

Author:

Michael Niedermayer <michael@niedermayer.cc>

Branches:

master

Children:

e5bae39f

Parents:

439c9760 (diff), d6604b29 (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 <michael@niedermayer.cc> (07/20/15 20:59:45)

git-committer:

Michael Niedermayer <michael@niedermayer.cc> (07/20/15 21:43:05)

Message:

Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'

• commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534': Gather all coded_frame allocations and free functions to a single place

Conflicts:

libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c

Merged-by: Michael Niedermayer <​michael@niedermayer.cc>

(No files)