diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2011-05-31 03:10:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 03:10:35 +0200 |
| commit | a54dceb26af072d049c3f3f003f2a4ab0df26987 (patch) | |
| tree | 8e3258024cebceb02dfdb90c1f3e86e7d6f05d39 | |
| parent | 40c29d42cfe5615b9e382b89f5bcba7a2d62cd29 (diff) | |
| download | ffmpeg-a54dceb26af072d049c3f3f003f2a4ab0df26987.tar.gz | |
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo
The maximum buffer size needs to be 33, not 32
merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pthread.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 | ||||
| -rw-r--r-- | mt-work/todo.txt | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 6d4ee549cb..4b68bce371 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -55,7 +55,7 @@ typedef struct ThreadContext { } ThreadContext; /// Max number of frame buffers that can be allocated when using frame threads. -#define MAX_BUFFERS 32 +#define MAX_BUFFERS 33 /** * Context used by codec threads and stored in their AVCodecContext thread_opaque. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 95f41f315a..1c61e68910 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -115,7 +115,7 @@ typedef struct InternalBuffer{ enum PixelFormat pix_fmt; }InternalBuffer; -#define INTERNAL_BUFFER_SIZE 32 +#define INTERNAL_BUFFER_SIZE 33 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[4]){ int w_align= 1; diff --git a/mt-work/todo.txt b/mt-work/todo.txt index 678d213d8c..861013da87 100644 --- a/mt-work/todo.txt +++ b/mt-work/todo.txt @@ -23,8 +23,9 @@ field pictures in the same packet are not optimal. Modify the nals_needed check so that the second field's first slice is considered as needed, then uncomment the FIXME code in decode_postinit. Ex: http://astrange.ithinksw.net/ffmpeg/mt-samples/PAFF-Chalet-Tire.mp4 -- The conformance sample MR3_TANDBERG_B.264 has problems (allocated picture overflow). -- One 10-bit sample has problems. +- The code added to shorten frame gaps (to avoid allocating more than 16 new frames) +appears to be wrong by inspection. It does not handle prev_frame_num > frame_num, +and "h->frame_num - h->sps.ref_frame_count - 1" should be "h->frame_num - h->sps.ref_frame_count". mpeg4: - Packed B-frames need to be explicitly split up |