Commit a54dceb2 authored by Alexander Strange's avatar Alexander Strange Committed by Michael Niedermayer

Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
      Update todo
      The maximum buffer size needs to be 33, not 32
merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 40c29d42
......@@ -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.
......
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment