[FFmpeg-cvslog] avcodec/g2meet: fix error returns

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  2 15:16:37 2014 +0100| [3c8a12be2f67d0f34a9b280e057fcd25260554b8] | committer: Michael Niedermayer

avcodec/g2meet: fix error returns

Fixes out of array accesses

This should not affect any release

Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6b53c1aa822e9c92be52a462dd0aef1c2010ce73)

Conflicts:

	libavcodec/g2meet.c

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

 libavcodec/g2meet.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 452cd7c..b83be23 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -709,7 +709,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
                 av_log(avctx, AV_LOG_ERROR,
                        "Unknown compression method %d\n",
                        c->compression);
-                return AVERROR_PATCHWELCOME;
+                ret = AVERROR_PATCHWELCOME;
+                goto header_fail;
             }
             c->tile_width  = bytestream2_get_be32(&bc);
             c->tile_height = bytestream2_get_be32(&bc);