Merge commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 13:00:53 +0000 (15:00 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 13:00:53 +0000 (15:00 +0200)
commit3d93ff289e0421d71cd63e246727d8ace256f27d
tree550f02bdee0db06ef5231921d9ebe0eb4f387869
parent9c3f75c29d2938bc3dd77a7733a11059ed2bc488
parent6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3
Merge commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3'

* commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3':
  libschroedinger: Properly use AVFrame API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libschroedinger.c
libavcodec/libschroedingerdec.c
libavcodec/libschroedingerenc.c