Changeset fb0c52f6b0233379c1d1759a8f17d6ffa53e1d86
- Timestamp:
- 04/24/08 19:15:42
(5 months ago)
- Author:
- Jean-Paul Saman <jpsaman@videolan.org>
- git-committer:
- Jean-Paul Saman <jpsaman@videolan.org> 1209057342 +0200
- git-parent:
[65dd9c3ba7805cc19e05ba73816cbe5b59fb3dd6]
- git-author:
- Jean-Paul Saman <jpsaman@videolan.org> 1208873548 +0200
- Message:
Fix indentation in scope blocks after bool change.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r449fd28 |
rfb0c52f |
|
| 327 | 327 | int i_stream_id; |
|---|
| 328 | 328 | int i_continuity_counter; |
|---|
| 329 | | bool b_discontinuity; |
|---|
| | 329 | bool b_discontinuity; |
|---|
| 330 | 330 | |
|---|
| 331 | 331 | /* to be used for carriege of DIV3 */ |
|---|
| … | … | |
| 347 | 347 | mtime_t i_pes_length; |
|---|
| 348 | 348 | int i_pes_used; |
|---|
| 349 | | bool b_key_frame; |
|---|
| | 349 | bool b_key_frame; |
|---|
| 350 | 350 | |
|---|
| 351 | 351 | } ts_stream_t; |
|---|
| … | … | |
| 359 | 359 | int i_video_bound; |
|---|
| 360 | 360 | |
|---|
| 361 | | bool b_es_id_pid; |
|---|
| 362 | | bool b_sdt; |
|---|
| | 361 | bool b_es_id_pid; |
|---|
| | 362 | bool b_sdt; |
|---|
| 363 | 363 | int i_pid_video; |
|---|
| 364 | 364 | int i_pid_audio; |
|---|
| … | … | |
| 378 | 378 | int i_pmt_program_number[MAX_PMT]; |
|---|
| 379 | 379 | sdt_desc_t sdt_descriptors[MAX_PMT]; |
|---|
| 380 | | bool b_data_alignment; |
|---|
| | 380 | bool b_data_alignment; |
|---|
| 381 | 381 | |
|---|
| 382 | 382 | int i_mpeg4_streams; |
|---|
| … | … | |
| 387 | 387 | |
|---|
| 388 | 388 | /* for TS building */ |
|---|
| 389 | | int64_t i_bitrate_min; |
|---|
| 390 | | int64_t i_bitrate_max; |
|---|
| 391 | | |
|---|
| 392 | | int64_t i_shaping_delay; |
|---|
| 393 | | int64_t i_pcr_delay; |
|---|
| 394 | | |
|---|
| 395 | | int64_t i_dts_delay; |
|---|
| 396 | | |
|---|
| 397 | | bool b_use_key_frames; |
|---|
| 398 | | |
|---|
| 399 | | mtime_t i_pcr; /* last PCR emited */ |
|---|
| 400 | | |
|---|
| 401 | | csa_t *csa; |
|---|
| 402 | | int i_csa_pkt_size; |
|---|
| 403 | | bool b_crypt_audio; |
|---|
| 404 | | bool b_crypt_video; |
|---|
| | 389 | int64_t i_bitrate_min; |
|---|
| | 390 | int64_t i_bitrate_max; |
|---|
| | 391 | |
|---|
| | 392 | int64_t i_shaping_delay; |
|---|
| | 393 | int64_t i_pcr_delay; |
|---|
| | 394 | |
|---|
| | 395 | int64_t i_dts_delay; |
|---|
| | 396 | |
|---|
| | 397 | bool b_use_key_frames; |
|---|
| | 398 | |
|---|
| | 399 | mtime_t i_pcr; /* last PCR emited */ |
|---|
| | 400 | |
|---|
| | 401 | csa_t *csa; |
|---|
| | 402 | int i_csa_pkt_size; |
|---|
| | 403 | bool b_crypt_audio; |
|---|
| | 404 | bool b_crypt_video; |
|---|
| 405 | 405 | }; |
|---|
| 406 | 406 | |
|---|
| … | … | |
| 1601 | 1601 | for( ;; ) |
|---|
| 1602 | 1602 | { |
|---|
| 1603 | | int i_stream; |
|---|
| 1604 | | mtime_t i_dts; |
|---|
| 1605 | | ts_stream_t *p_stream; |
|---|
| | 1603 | int i_stream; |
|---|
| | 1604 | mtime_t i_dts; |
|---|
| | 1605 | ts_stream_t *p_stream; |
|---|
| 1606 | 1606 | sout_input_t *p_input; |
|---|
| 1607 | | block_t *p_ts; |
|---|
| 1608 | | bool b_pcr; |
|---|
| | 1607 | block_t *p_ts; |
|---|
| | 1608 | bool b_pcr; |
|---|
| 1609 | 1609 | |
|---|
| 1610 | 1610 | /* Select stream (lowest dts) */ |
|---|
| … | … | |
| 1908 | 1908 | bool b_adaptation_field = false; |
|---|
| 1909 | 1909 | |
|---|
| 1910 | | int i_payload_max = 184 - ( b_pcr ? 8 : 0 ); |
|---|
| 1911 | | int i_payload; |
|---|
| | 1910 | int i_payload_max = 184 - ( b_pcr ? 8 : 0 ); |
|---|
| | 1911 | int i_payload; |
|---|
| 1912 | 1912 | |
|---|
| 1913 | 1913 | if( p_stream->i_pes_used <= 0 ) |
|---|