diff options
| author | Anuradha Suraparaju <anuradha@rd.bbc.co.uk> | 2009-08-15 11:59:53 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-15 11:59:53 +0000 |
| commit | d15f2e00c5a0c2b84f1a1f457044b6e57ca7e63d (patch) | |
| tree | 0b005cec238ba7221133904d7188276696e27787 /libavcodec/libschroedingerdec.c | |
| parent | 0ebe3b8e2bf74503d7c9cc383e29254a3cb06d55 (diff) | |
Fix bug caused by difference in stride and picture width.
When a frame is allocated using libschroedinger routines, the frame data size
does not match the actual frame size if the width is not a multiple of 16. So
we cannot do a straightforward memcpy of the frame returned by libschroedinger
into the FFmpeg picture as the stride differs from the width.
Fix this bug by allocating for the libschroedinger frame with the dimensions
in AVCodecContext within libavcodec and passing the frame to libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
Originally committed as revision 19653 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libschroedingerdec.c')
| -rw-r--r-- | libavcodec/libschroedingerdec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 02ee24bb92..53ded57ba4 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -256,11 +256,8 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, case SCHRO_DECODER_NEED_FRAME: /* Decoder needs a frame - create one and push it in. */ - - frame = schro_frame_new_and_alloc(NULL, - p_schro_params->frame_format, - format->width, - format->height); + frame = ff_create_schro_frame(avccontext, + p_schro_params->frame_format); schro_decoder_add_output_picture(decoder, frame); break; |