Skip to content

F
ffmpeg
Commit ccba88d7 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files
Options

cosmectics, mov -> mp4 

Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 295b7dc3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavformat/isom.c
View file @ ccba88d7
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "isom.h" #include "isom.h"
/* http://www.mp4ra.org */ /* http://www.mp4ra.org */
const AVCodecTag ff_mov_obj_type[] = { const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_MPEG4 , 32 }, { CODEC_ID_MPEG4 , 32 },
{ CODEC_ID_H264 , 33 }, { CODEC_ID_H264 , 33 },
{ CODEC_ID_AAC , 64 }, { CODEC_ID_AAC , 64 },
......
libavformat/isom.h
View file @ ccba88d7
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define FFMPEG_ISOM_H #define FFMPEG_ISOM_H
/* isom.c */ /* isom.c */
extern const AVCodecTag ff_mov_obj_type[]; extern const AVCodecTag ff_mp4_obj_type[];
extern const AVCodecTag codec_movvideo_tags[]; extern const AVCodecTag codec_movvideo_tags[];
extern const AVCodecTag codec_movaudio_tags[]; extern const AVCodecTag codec_movaudio_tags[];
......
libavformat/mov.c
View file @ ccba88d7
...@@ -382,7 +382,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -382,7 +382,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc->esds.max_bitrate = get_be32(pb); sc->esds.max_bitrate = get_be32(pb);
sc->esds.avg_bitrate = get_be32(pb); sc->esds.avg_bitrate = get_be32(pb);
st->codec->codec_id= codec_get_id(ff_mov_obj_type, sc->esds.object_type_id); st->codec->codec_id= codec_get_id(ff_mp4_obj_type, sc->esds.object_type_id);
dprintf(c->fc, "esds object type id %d\n", sc->esds.object_type_id); dprintf(c->fc, "esds object type id %d\n", sc->esds.object_type_id);
len = mov_mp4_read_descr(c, pb, &tag); len = mov_mp4_read_descr(c, pb, &tag);
if (tag == MP4DecSpecificDescrTag) { if (tag == MP4DecSpecificDescrTag) {
......
libavformat/movenc.c
View file @ ccba88d7
...@@ -260,7 +260,7 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic ...@@ -260,7 +260,7 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
putDescr(pb, 0x04, 13 + decoderSpecificInfoLen); putDescr(pb, 0x04, 13 + decoderSpecificInfoLen);
// Object type indication // Object type indication
put_byte(pb, codec_get_tag(ff_mov_obj_type, track->enc->codec_id)); put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id));
// the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio) // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
// plus 1 bit to indicate upstream and 1 bit set to 1 (reserved) // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment