diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 18:29:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 18:29:23 +0200 |
| commit | 5c6f7ed667d6109505c19e15078777d8d764df40 (patch) | |
| tree | a5107faf605bcb6a3967a5dfaffc78668743e09e /tests/ref/fate/ffprobe_default | |
| parent | db2d3a90825025b2f5da85792e1df33280c61391 (diff) | |
| parent | 464f94b206b041fa383ab4257226cb3f18dfb550 (diff) | |
| download | ffmpeg-5c6f7ed667d6109505c19e15078777d8d764df40.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: do not init frame with guessed layout.
lavfi/af_atempo: simplify request_frame loop.
lavfi/af_asetnsamples: simplify request_frame loop.
lavfi/f_ebur128: remove request_frame hack.
lavfi/vf_tile: simplify request_frame loop.
lavfi: reindent after last commit.
lavfi: loop on request_frame if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/ffprobe_default')
| -rw-r--r-- | tests/ref/fate/ffprobe_default | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 26922c135d..6f6341da3b 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -27,7 +27,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -132,7 +132,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -237,7 +237,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=audio @@ -268,7 +268,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -373,7 +373,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=audio @@ -404,7 +404,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video |