diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 03:11:50 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 03:11:50 +0200 |
commit | 0424e052f83adc422d8a746e3cdc5ab6bc28679e (patch) | |
tree | 80437095d9912fb844ec2773afe862d54f08c80d /libavformat/network.h | |
parent | 5c08c7b2151409c3b7a05e54fe46834deedff119 (diff) | |
download | ffmpeg-0424e052f83adc422d8a746e3cdc5ab6bc28679e.tar.gz |
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo.
h264: add an assert that copied pictures are valid picture pointers
valgrind-check: run with 1 and 3 threads
h264: When decoding a packet with multiple PPS/SPS, don't start the next thread until all of them have been read
Allow some pictures to be released earlier after 51ead6d2c40c5defdd211f435aec49b19f5f6a18
h264: fix slice threading MC reading uninitialized frame edges.
Please see ffmpeg-mt for a list of authors of these changes.
Conflicts:
libavcodec/h264.c
mt-work/valgrind-check.sh
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
0 files changed, 0 insertions, 0 deletions