diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:36:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:36:53 +0100 |
| commit | 4063bb212e18a0dac17133905526b09b4fab5415 (patch) | |
| tree | 549369cc63728d0c786b8926928ee4e060cb3418 /libavcodec/samidec.c | |
| parent | 577b39aea221ddc9606f3b5ca698516155cdfd43 (diff) | |
| parent | d5e83122bdc39b9c0278b9b4f6c49baa99223bd6 (diff) | |
| download | ffmpeg-4063bb212e18a0dac17133905526b09b4fab5415.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set Picture.owner2 to the current thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/samidec.c')
0 files changed, 0 insertions, 0 deletions