diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:43:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:48:17 +0100 |
| commit | 8d193a24f2da825aaf5382e4aa42ab533806b033 (patch) | |
| tree | 179ac9e6e4fc57d0e11855418d30309ce408a1ff /libavformat/rmsipr.c | |
| parent | 72df87088c8a6593d66b207140edd32b4d2fb6ee (diff) | |
| parent | 730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7 (diff) | |
| download | ffmpeg-8d193a24f2da825aaf5382e4aa42ab533806b033.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rmsipr.c')
0 files changed, 0 insertions, 0 deletions