Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
41e9682a
Commit
41e9682a
authored
May 31, 2012
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
movenc: Write chan atom for all audio tracks in mov mode movies.
parent
84e430dd
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
13 deletions
+15
-13
movenc.c
libavformat/movenc.c
+3
-1
acodec-alac
tests/ref/fate/acodec-alac
+2
-2
acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s16be
+2
-2
acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s24be
+2
-2
acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s32be
+2
-2
acodec-pcm-s8
tests/ref/fate/acodec-pcm-s8
+2
-2
mov
tests/ref/lavf/mov
+2
-2
No files found.
libavformat/movenc.c
View file @
41e9682a
...
...
@@ -390,7 +390,6 @@ static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track)
}
else
if
(
track
->
enc
->
codec_id
==
CODEC_ID_AMR_NB
)
{
mov_write_amr_tag
(
pb
,
track
);
}
else
if
(
track
->
enc
->
codec_id
==
CODEC_ID_AC3
)
{
mov_write_chan_tag
(
pb
,
track
);
mov_write_ac3_tag
(
pb
,
track
);
}
else
if
(
track
->
enc
->
codec_id
==
CODEC_ID_ALAC
)
{
mov_write_extradata_tag
(
pb
,
track
);
...
...
@@ -638,6 +637,9 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
else
if
(
track
->
vos_len
>
0
)
mov_write_glbl_tag
(
pb
,
track
);
if
(
track
->
mode
==
MODE_MOV
&&
track
->
enc
->
codec_type
==
AVMEDIA_TYPE_AUDIO
)
mov_write_chan_tag
(
pb
,
track
);
return
update_size
(
pb
,
pos
);
}
...
...
tests/ref/fate/acodec-alac
View file @
41e9682a
238759bcb462fe9697973f4dd04d5b54
*tests/data/fate/acodec-alac.mov
3892
34
tests/data/fate/acodec-alac.mov
8ad790d3a0bbda81cd23c15ab8ba760d
*tests/data/fate/acodec-alac.mov
3892
58
tests/data/fate/acodec-alac.mov
64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-alac.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/fate/acodec-pcm-s16be
View file @
41e9682a
53c9eb319c778e7ce137667f62384994
*tests/data/fate/acodec-pcm-s16be.mov
10600
73
tests/data/fate/acodec-pcm-s16be.mov
b023c4792bd206fa96f64a8a012b6eb8
*tests/data/fate/acodec-pcm-s16be.mov
10600
97
tests/data/fate/acodec-pcm-s16be.mov
64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16be.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/fate/acodec-pcm-s24be
View file @
41e9682a
af8acd2f08e4bbebe7f4bea4d6f59dd6
*tests/data/fate/acodec-pcm-s24be.mov
15892
73
tests/data/fate/acodec-pcm-s24be.mov
3607f8c7029a0c2ca2c8bf2c929518b3
*tests/data/fate/acodec-pcm-s24be.mov
15892
97
tests/data/fate/acodec-pcm-s24be.mov
64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24be.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/fate/acodec-pcm-s32be
View file @
41e9682a
63f0e22b4f7c5d61d75047d85f140d52
*tests/data/fate/acodec-pcm-s32be.mov
21184
73
tests/data/fate/acodec-pcm-s32be.mov
2a47292543cb0c25583a49397504e6d1
*tests/data/fate/acodec-pcm-s32be.mov
21184
97
tests/data/fate/acodec-pcm-s32be.mov
64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32be.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/fate/acodec-pcm-s8
View file @
41e9682a
4b3013a3f3c328ecdb617cd88b3fe836
*tests/data/fate/acodec-pcm-s8.mov
5308
73
tests/data/fate/acodec-pcm-s8.mov
953eb563c7ea81c1ec73c5a806975e34
*tests/data/fate/acodec-pcm-s8.mov
5308
97
tests/data/fate/acodec-pcm-s8.mov
651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-s8.out.wav
stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400
tests/ref/lavf/mov
View file @
41e9682a
6c5472152b46e070ae6da359838e1f86
*./tests/data/lavf/lavf.mov
3577
17
./tests/data/lavf/lavf.mov
a5c982910b1a1547db68ffa35cc2a05a
*./tests/data/lavf/lavf.mov
3577
41
./tests/data/lavf/lavf.mov
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment