| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
stale pointers
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
| |
Reduces difference to 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
| |
Bug found from comparing 56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
| |
Idea-from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
| |
This would allow the example to be used in regression tests
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
| |
supported by the encoder
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
| |
Idea from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
output example: set the stream timebase
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '182d3f8221c23716ea4eafa460bdb94968f71f26':
output example: rewrite encoding logic
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11':
output example: store the scaling context in the stream context
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
output example: use a macro instead of a static variable
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
output example: allocate the audio frame only once
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb':
output example: use OutputStream for audio streams as well
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38':
output example: use the new AVFrame API to allocate audio frames
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
output example: set output channel layout
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3':
output example: use a struct to bundle the video stream variables together
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit '38d044429dabcd28928693240e955c6d4430cca9':
output example: use the new AVFrame API for allocating the video frame
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
Use av_packet_rescale_ts() to simplify code.
Conflicts:
doc/examples/muxing.c
ffmpeg.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
| |
This makes the examples page less cluttered
Reviewed-by: Clément Bœsch <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
* qatar/master:
doc/examples: misc Doxygen markup improvements
Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c
Merged-by: Michael Niedermayer <[email protected]>
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Set duration to 10 seconds, after it was increased from 5 to 200 seconds
in 8d80f3cb877b890889b1673029387229648901ed.
200 seconds will generate too much data which is annoying especially when
testing.
|
| |
|
|
|
|
| |
More consistent and more future-proof.
|
|
|
|
| |
Also log output packet information.
|
|
|
|
| |
Rely on frame_count. Also more consistent with audio path.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes use of the example with encoders which use tha AVFrame w/h/pix_fmt fields
FFV1 is one of these codecs
We cannot easily workaround the not set fields in common code because the API
has AVFrame constant for the encoders.
Alternatives would be to fix the API or to duplicate the struct and fill in
missing fields. Or as is to require all user apps to set this correctly and
maybe simplify for that case
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
| |
In particular, fix trac ticket #3231.
|
| |
|
|
|
|
| |
Simplify logic, avoid multiple unnecessary alloc/free operations.
|
|
|
|
|
|
|
|
|
|
| |
timebase
Fix PTS set on the frame when encoding, which must be specified in the
encoder timebase or this will confuse the encoder.
When muxing the packet, the PTS/DTS generated by the encoder is then
rescaled to the stream timebase.
|
|
|
|
|
| |
Avoid the need of tweaking, also show how to get list of supported sample
formats.
|
|
|
|
|
|
|
| |
- do not allocate resample dst buffer when resample is off
- free sample buffers in addition to freeing data pointer arrays
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
| |
sample_fmt
We generate S16 samples and we should allocate the right buffer
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
| |
Hi list! Since my last patch (fix 2 memleaks in doc/examples/muxing.c)
I found more problems to fix.
Signed-off-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
Replace all uses of avcodec_free_frame with av_frame_free().
Conflicts:
doc/examples/decoding_encoding.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <[email protected]>
|
|
|
|
|
| |
Allows to encode to output in case the destination sample format is
different from AV_SAMPLE_FMT_S16.
|
| |
|
|
|
|
|
| |
The new name is less confusing, since the variables represent times
rather than timestamps.
|
|
|
|
| |
Simpler and less confusing.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
avconv: print an error on applying options of the wrong type.
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
output-example: Update to use encode_video2 instead of the now dropped encode_video
Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h
Merged-by: Michael Niedermayer <[email protected]>
|