diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:43:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:58:18 +0100 |
| commit | fa14685a578d4d37f9a53c2399bba7770e48f747 (patch) | |
| tree | 7b748d69f420ba6b2fd8a62433b194addf60d1ad /tests/ref/fate/ffprobe_json | |
| parent | d5e9fc782150d4596c72440a0aa02b7f4f1254b1 (diff) | |
| parent | 7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f (diff) | |
| download | ffmpeg-fa14685a578d4d37f9a53c2399bba7770e48f747.tar.gz | |
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
avprobe: Export coded_{width,height} in -show_streams
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/ffprobe_json')
| -rw-r--r-- | tests/ref/fate/ffprobe_json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index a0aecbd8ae..ee2f8e6da9 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -552,6 +552,8 @@ "codec_tag": "0x18424752", "width": 320, "height": 240, + "coded_width": 320, + "coded_height": 240, "has_b_frames": 0, "sample_aspect_ratio": "1:1", "display_aspect_ratio": "4:3", @@ -593,6 +595,8 @@ "codec_tag": "0x18424752", "width": 100, "height": 100, + "coded_width": 100, + "coded_height": 100, "has_b_frames": 0, "sample_aspect_ratio": "1:1", "display_aspect_ratio": "1:1", |