summaryrefslogtreecommitdiff
path: root/libavformat/electronicarts.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-16 12:08:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-16 12:08:47 +0200
commit6bba6957858fe97bda8155dd8e6f857441410eed (patch)
treeb877d57ced0a06b28644d55f7fce8ea5184f454b /libavformat/electronicarts.c
parent6a4e55a246369c007240fdd7732c2743ee740723 (diff)
parenta90cff137b2aca89380b0acad41cd7bb05619ece (diff)
downloadffmpeg-6bba6957858fe97bda8155dd8e6f857441410eed.tar.gz
Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'
* commit 'a90cff137b2aca89380b0acad41cd7bb05619ece': electronicarts: comment wording fixes Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/electronicarts.c')
-rw-r--r--libavformat/electronicarts.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 67e9351ae6..f046393f58 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -44,21 +44,21 @@
#define GSTR_TAG MKTAG('G', 'S', 'T', 'R')
#define SCDl_TAG MKTAG('S', 'C', 'D', 'l')
#define SCEl_TAG MKTAG('S', 'C', 'E', 'l')
-#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV i-frame */
-#define fVGT_TAG MKTAG('f', 'V', 'G', 'T') /* TGV p-frame */
+#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV I-frame */
+#define fVGT_TAG MKTAG('f', 'V', 'G', 'T') /* TGV P-frame */
#define mTCD_TAG MKTAG('m', 'T', 'C', 'D') /* MDEC */
-#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */
-#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD p-frame */
+#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD I-frame */
+#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD P-frame */
#define MADe_TAG MKTAG('M', 'A', 'D', 'e') /* MAD lqp-frame */
-#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG2 */
-#define TGQs_TAG MKTAG('T', 'G', 'Q', 's') /* TGQ i-frame (appears in .TGQ files) */
-#define pQGT_TAG MKTAG('p', 'Q', 'G', 'T') /* TGQ i-frame (appears in .UV files) */
-#define pIQT_TAG MKTAG('p', 'I', 'Q', 'T') /* TQI/UV2 i-frame (.UV2/.WVE) */
+#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG-2 */
+#define TGQs_TAG MKTAG('T', 'G', 'Q', 's') /* TGQ I-frame (appears in .TGQ files) */
+#define pQGT_TAG MKTAG('p', 'Q', 'G', 'T') /* TGQ I-frame (appears in .UV files) */
+#define pIQT_TAG MKTAG('p', 'I', 'Q', 'T') /* TQI/UV2 I-frame (.UV2/.WVE) */
#define MVhd_TAG MKTAG('M', 'V', 'h', 'd')
#define MV0K_TAG MKTAG('M', 'V', '0', 'K')
#define MV0F_TAG MKTAG('M', 'V', '0', 'F')
#define MVIh_TAG MKTAG('M', 'V', 'I', 'h') /* CMV header */
-#define MVIf_TAG MKTAG('M', 'V', 'I', 'f') /* CMV i-frame */
+#define MVIf_TAG MKTAG('M', 'V', 'I', 'f') /* CMV I-frame */
typedef struct EaDemuxContext {
int big_endian;
@@ -349,10 +349,8 @@ static int process_video_header_cmv(AVFormatContext *s)
return 0;
}
-/*
- * Process EA file header
- * Returns 1 if the EA file is valid and successfully opened, 0 otherwise
- */
+/* Process EA file header.
+ * Return 1 if the EA file is valid and successfully opened, 0 otherwise. */
static int process_ea_header(AVFormatContext *s)
{
uint32_t blockid, size = 0;
@@ -635,7 +633,7 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
goto get_video_packet;
case mTCD_TAG:
- avio_skip(pb, 8); // skip ea dct header
+ avio_skip(pb, 8); // skip ea DCT header
chunk_size -= 8;
goto get_video_packet;