[FFmpeg-cvslog] libstagefright: set the correct frame size

[Mohamed Naufal]

ffmpeg | branch: master | Mohamed Naufal <naufal22 at gmail.com> | Fri Oct  7 17:19:08 2011 +0530| [09a49e8919ddd31d0255f46ad1c3d19be7bb5ed1] | committer: Mohamed Naufal

libstagefright: set the correct frame size

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09a49e8919ddd31d0255f46ad1c3d19be7bb5ed1
---

 libavcodec/libstagefright.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libstagefright.cpp b/libavcodec/libstagefright.cpp
index 2022bab..6989357 100644
--- a/libavcodec/libstagefright.cpp
+++ b/libavcodec/libstagefright.cpp
@@ -311,7 +311,7 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data,
         frame = (Frame*)av_mallocz(sizeof(Frame));
         if (avpkt->data) {
             frame->status  = OK;
-            frame->size    = orig_size;
+            frame->size    = avpkt->size;
             // Stagefright can't handle negative timestamps -
             // if needed, work around this by offsetting them manually?
             if (avpkt->pts >= 0)
@@ -324,8 +324,10 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data,
             }
             uint8_t *ptr = avpkt->data;
             // The OMX.SEC decoder fails without this.
-            if (avpkt->size == orig_size + avctx->extradata_size)
+            if (avpkt->size == orig_size + avctx->extradata_size) {
                 ptr += avctx->extradata_size;
+                frame->size = orig_size;
+            }
             memcpy(frame->buffer, ptr, orig_size);
         } else {
             frame->status  = ERROR_END_OF_STREAM;