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_json | |
| 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_json')
| -rw-r--r-- | tests/ref/fate/ffprobe_json | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index 1864debda0..94e63fc0ae 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -28,7 +28,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -132,7 +133,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -236,7 +238,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -266,7 +269,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -370,7 +374,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", @@ -400,7 +405,8 @@ "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1 + "channels": 1, + "channel_layout": "mono" }, { "type": "packet", |