Changeset f351afb in ffmpeg

Timestamp:

Jul 11, 2014, 9:43:33 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

673a2b38

Parents:

9195c26d (diff), 17e9d52c (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> (07/11/14 09:42:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/11/14 09:43:33)

Message:

Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'

• commit '17e9d52c8c93f47721ff481b8867922f4b4bd663': hevc_ps: remove a write-only variable

Conflicts:

libavcodec/hevc_ps.c

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

(No files)