[FFmpeg-cvslog] oggdec: fix invalid free on error

[wm4]

ffmpeg | branch: release/2.1 | wm4 <nfxjfg at googlemail.com> | Sat Aug 30 15:39:15 2014 +0200| [17f30ab6a154e18e3d7b6bf57490dc971cd274ca] | committer: Michael Niedermayer

oggdec: fix invalid free on error

The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b173f5c15572cc82f68128599722e689df4ff137)

Conflicts:

	libavformat/oggdec.c
(cherry picked from commit a82401b7284e05e2cf6fb89aeed53738af06a7fd)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/oggdec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index e052c27..d6e09b4 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -780,7 +780,6 @@ retry:
                                                      10);
         if(side_data == NULL) {
             av_free_packet(pkt);
-            av_free(pkt);
             return AVERROR(ENOMEM);
         }
         AV_WL32(side_data + 4, os->end_trimming);