[FFmpeg-cvslog] rtpdec_qdm2: Don't try to parse data packet if no configuration is received

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu May 12 22:47:53 2011 +0300| [552a99957f7c6f6ed13795caee7ab7b9deb5d76e] | committer: Martin Storsjö

rtpdec_qdm2: Don't try to parse data packet if no configuration is received

The later parsing of payload data depends on the configuration
being present. If it hasn't been configured properly yet,
parsing a data packet may lead to a crash.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/rtpdec_qdm2.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c
index 7f5f077..66dd874 100644
--- a/libavformat/rtpdec_qdm2.c
+++ b/libavformat/rtpdec_qdm2.c
@@ -266,6 +266,8 @@ static int qdm2_parse_packet(AVFormatContext *s, PayloadContext *qdm,
              * to the decoder that it is OK to initialize. */
             st->codec->codec_id = CODEC_ID_QDM2;
         }
+        if (st->codec->codec_id == CODEC_ID_NONE)
+            return AVERROR(EAGAIN);
 
         /* subpackets */
         while (end - p >= 4) {