aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-211-27/+39
|\
| * avconv: Separate initialization from the main transcode loop.Alex Converse2011-08-191-25/+37
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-201-13/+13
|\|
| * avconv: reset input_ts_offset between files.Anton Khirnov2011-08-191-0/+1
| * avconv: call flush_encoders() from transcode() directly.Anton Khirnov2011-08-191-6/+3
| * avconv: fix broken indentation.Anton Khirnov2011-08-191-1/+1
| * avconv: rescue poor abused limit_filesize global.Anton Khirnov2011-08-191-6/+8
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-191-3/+9
|\|
| * avconv: Set error code before before jumping to fail.Alex Converse2011-08-191-3/+9
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-191-164/+157
|\|
| * avconv: Fix spelling errors.Alex Converse2011-08-181-4/+4
| * avconv: save two levels of indentation in flush_encoders()Anton Khirnov2011-08-181-69/+67
| * avconv: factor flushing encoders out of output_packet().Anton Khirnov2011-08-181-81/+88
| * avconv: factor out initializing input streams.Anton Khirnov2011-08-181-46/+47
| * avconv: remove -intra option.Anton Khirnov2011-08-181-4/+0
| * avconv: reset streamid_map between output files.Anton Khirnov2011-08-181-1/+2
| * avconv: make timer_start a local var in transcode().Anton Khirnov2011-08-181-5/+4
| * avconv: cosmetics, move OutputStream.Anton Khirnov2011-08-181-26/+25
| * avconv: remove two unused macros.Anton Khirnov2011-08-181-5/+0
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-181-408/+382
|\|
| * avconv: reindent.Anton Khirnov2011-08-171-109/+109
| * avconv: rescue poor abused start_time global.Anton Khirnov2011-08-171-5/+11
| * avconv: rescue poor abused recording_time global.Anton Khirnov2011-08-171-9/+13
| * avconv: merge two loops in output_packet().Anton Khirnov2011-08-171-19/+9
| * avconv: fix broken indentation.Anton Khirnov2011-08-171-2/+3
| * avconv: get rid of the arbitrary MAX_FILES limit.Anton Khirnov2011-08-171-7/+7
| * avconv: get rid of the output_streams_for_file vs. ost_table schizophreniaAnton Khirnov2011-08-171-59/+38
| * avconv: add a wrapper for output AVFormatContexts and merge output_opts into itAnton Khirnov2011-08-171-28/+45
| * avconv: make itsscale syntax consistent with other options.Anton Khirnov2011-08-171-20/+17
| * avconv: factor out adding input streams.Anton Khirnov2011-08-171-63/+74
| * avconv: Factorize combining auto vsync with format.Alex Converse2011-08-171-3/+7
| * avconv: Factorize video resampling.Alex Converse2011-08-171-54/+64
| * avconv: Don't unnecessarily convert ipts to a double.Alex Converse2011-08-171-4/+5
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-171-1/+3
|\|
| * Revert "avconv: use stream copy by default when possible."Anton Khirnov2011-08-161-31/+21
| * avconv: print stream copy information.Anton Khirnov2011-08-161-0/+2
| * avconv: use stream copy by default when possible.Anton Khirnov2011-08-161-21/+31
| * avconv: don't segfault on 0 input files.Anton Khirnov2011-08-161-1/+1
* | avconv: Correct Copyright statement.Michael Niedermayer2011-08-171-2/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-161-322/+237
|\|
| * avconv: remove a write-only variableAnton Khirnov2011-08-161-4/+0
| * avconv: remove pointless parameter from new_*_stream().Anton Khirnov2011-08-161-21/+21
| * avconv: cosmetics, move codeAnton Khirnov2011-08-161-127/+126
| * avconv: cosmetics -- move copy_chapters().Anton Khirnov2011-08-161-40/+40
| * avconv: cosmetics -- move parse_forced_key_frames().Anton Khirnov2011-08-161-23/+23
| * lavc: add audio flag to the 'b' option, deprecate 'ab'.Anton Khirnov2011-08-161-3/+3
| * avconv: rename sameq to same_quantAnton Khirnov2011-08-161-6/+6
| * avconv: replace -vcodec/-acodec/-scodec with a better system.Anton Khirnov2011-08-161-149/+97
| * avconv: remove presets.Anton Khirnov2011-08-161-45/+0
* | avconv: fix uninitialized variableMichael Niedermayer2011-08-161-1/+1