[FFmpeg-cvslog] avformat/flvdec: use named identifier instead of literal numbers as return values
Michael Niedermayer
git at videolan.org
Thu Jan 1 20:19:44 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 1 19:14:06 2015 +0100| [efc4bfc195dab6efa77b444eac9313df4596a922] | committer: Michael Niedermayer
avformat/flvdec: use named identifier instead of literal numbers as return values
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efc4bfc195dab6efa77b444eac9313df4596a922
---
libavformat/flvdec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index dc0edf2..c13c0e4 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -546,6 +546,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
return 0;
}
+#define TYPE_ONTEXTDATA 1
+#define TYPE_UNKNOWN 2
+
static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
{
AMFDataType type;
@@ -566,13 +569,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
type = avio_r8(ioc);
if (type != AMF_DATA_TYPE_STRING ||
amf_get_string(ioc, buffer, sizeof(buffer)) < 0)
- return 2;
+ return TYPE_UNKNOWN;
if (!strcmp(buffer, "onTextData"))
- return 1;
+ return TYPE_ONTEXTDATA;
if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint"))
- return 2;
+ return TYPE_UNKNOWN;
// find the streams now so that amf_parse_object doesn't need to do
// the lookup every time it is called.
More information about the ffmpeg-cvslog
mailing list