diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 16:03:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 16:14:38 +0100 |
| commit | 71949ef715a29878424b2fb40c471cfb71c6bb98 (patch) | |
| tree | 6d83bab24e4218eba1c840ba76081d00ba746315 /libavfilter/vf_deshake.c | |
| parent | 54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff (diff) | |
| parent | 5945c7b35d9169caf9ecef1c419eebdebb909e60 (diff) | |
| download | ffmpeg-71949ef715a29878424b2fb40c471cfb71c6bb98.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: slice-mt: check master context for valid current_picture_ptr
h264: slice-mt: get last_pic_dropable from master context
alacenc: add support for multi-channel encoding
Conflicts:
Changelog
libavcodec/alac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_deshake.c')
0 files changed, 0 insertions, 0 deletions