diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:41:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:49:59 +0100 |
commit | f9fd6f983b979b2da0f9bba3d6b150a302deb1fe (patch) | |
tree | 6e1f91b358394778f798a4d32b22f8317d93a06e /tests/ref/fate/ffprobe_ini | |
parent | a7f9d92a6d54495f812317abe249582c66efb7b6 (diff) | |
parent | 2eba9087f3031c6050f8dcd996225490be6c2410 (diff) | |
download | ffmpeg-f9fd6f983b979b2da0f9bba3d6b150a302deb1fe.tar.gz |
Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'
* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
lavc: make up a fake frame channel layout when there is no real one.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/ffprobe_ini')
-rw-r--r-- | tests/ref/fate/ffprobe_ini | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index 0e324b63b6..85349a52a9 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -29,7 +29,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.1] codec_type=video @@ -136,7 +136,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.4] codec_type=video @@ -243,7 +243,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.7] codec_type=audio @@ -274,7 +274,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.8] codec_type=video @@ -381,7 +381,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.11] codec_type=audio @@ -412,7 +412,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=unknown +channel_layout=mono [packets_and_frames.packet.12] codec_type=video |