On Sat, 24 Dec 2011 22:34:57 +0530, Aneesh Dogra <[email protected]> wrote:
> ---
> avconv.c | 604
> +++++++++++++++++++++++++++++++-------------------------------
> 1 files changed, 304 insertions(+), 300 deletions(-)
>
> diff --git a/avconv.c b/avconv.c
> index ecbf523..65f89f5 100644
> --- a/avconv.c
> +++ b/avconv.c
> @@ -90,9 +90,9 @@ typedef struct StreamMap {
> * select an input file for an output file
> */
> typedef struct MetadataMap {
> - int file; ///< file index
> - char type; ///< type of metadata to copy -- (g)lobal, (s)tream,
> (c)hapter or (p)rogram
> - int index; ///< stream/chapter/program number
> + int file; // /< file index
> + char type; // /< type of metadata to copy -- (g)lobal, (s)tream,
> (c)hapter or (p)rogram
> + int index; // /< stream/chapter/program number
No, no space here.
///< and /** are doxygen tags, they have special meaning.
> @@ -1218,16 +1220,16 @@ static void do_video_out(AVFormatContext *s,
> method. */
> enc->coded_frame->interlaced_frame =
> in_picture->interlaced_frame;
> enc->coded_frame->top_field_first = in_picture->top_field_first;
> - pkt.data= (uint8_t *)final_picture;
> - pkt.size= sizeof(AVPicture);
> - pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base,
> ost->st->time_base);
> + pkt.data = (uint8_t *)final_picture;
> + pkt.size = sizeof(AVPicture);
> + pkt.pts = av_rescale_q(ost->sync_opts, enc->time_base,
> ost->st->time_base);
Vertical alignment.
> @@ -1551,7 +1555,7 @@ static int check_output_constraints(InputStream *ist,
> OutputStream *ost)
>
> if (of->recording_time != INT64_MAX &&
> av_compare_ts(ist->pts, AV_TIME_BASE_Q, of->recording_time +
> of->start_time,
> - (AVRational){1, 1000000}) >= 0) {
> + (AVRational) { 1, 1000000 }) >= 0) {
No spaces in casts. Same in several places below.
> @@ -2441,14 +2445,14 @@ static int transcode(OutputFile *output_files,
> continue;
> opts = ost->st->pts.val * av_q2d(ost->st->time_base);
> ipts = ist->pts;
> - if (!input_files[ist->file_index].eof_reached){
> - if(ipts < ipts_min) {
> + if (!input_files[ist->file_index].eof_reached) {
> + if (ipts < ipts_min) {
> ipts_min = ipts;
> - if(input_sync ) file_index = ist->file_index;
> + if (input_sync ) file_index = ist->file_index;
There's an extra space inside the parentheses.
> @@ -2506,27 +2510,27 @@ static int transcode(OutputFile *output_files,
> if (pkt.pts != AV_NOPTS_VALUE)
> pkt.pts += av_rescale_q(input_files[ist->file_index].ts_offset,
> AV_TIME_BASE_Q, ist->st->time_base);
>
> - if(pkt.pts != AV_NOPTS_VALUE)
> + if (pkt.pts != AV_NOPTS_VALUE)
> pkt.pts *= ist->ts_scale;
> - if(pkt.dts != AV_NOPTS_VALUE)
> + if (pkt.dts != AV_NOPTS_VALUE)
> pkt.dts *= ist->ts_scale;
>
> // fprintf(stderr, "next:%"PRId64" dts:%"PRId64" off:%"PRId64" %d\n",
> ist->next_pts, pkt.dts, input_files[ist->file_index].ts_offset,
> ist->st->codec->codec_type);
> if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE
> && (is->iformat->flags & AVFMT_TS_DISCONT)) {
> - int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base,
> AV_TIME_BASE_Q);
> - int64_t delta= pkt_dts - ist->next_pts;
> - if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE ||
> pkt_dts+1<ist->pts)&& !copy_ts){
> + int64_t pkt_dts = av_rescale_q(pkt.dts, ist->st->time_base,
> AV_TIME_BASE_Q);
> + int64_t delta = pkt_dts - ist->next_pts;
Vertical alignment.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
