diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-17 02:43:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-01-07 03:32:13 +0100 |
| commit | 48c192c48c3cf563bb763cdcd4b880cf7645557d (patch) | |
| tree | 0307f5508c6ae8bf74670b79082829c81c1b9f38 /libavcodec/sgienc.c | |
| parent | dbb4ff685135a39f37224fd9e85bbf59c215c6d1 (diff) | |
Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'
* commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7':
mss4: use the AVFrame API properly.
mss3: use the AVFrame API properly.
mss2: use the AVFrame API properly.
mss1: use the AVFrame API properly.
Conflicts:
libavcodec/mss1.c
libavcodec/mss2.c
libavcodec/mss3.c
libavcodec/mss4.c
See: 02fe531afefa7ac3fcc552f8e83461a4bfa7f868
See: ff1c13b133d548b3ce103f91999b6cc1bb7e65cc
See: 310bf283542ff81a9ec8fa7492fe7d625e80562f
Merged-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 8d193a24f2da825aaf5382e4aa42ab533806b033)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/sgienc.c')
0 files changed, 0 insertions, 0 deletions