Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/examples/muxing.c
AgeCommit message (Collapse)Author
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-04-11doc/examples/muxing: Add support to pass flags to muxer as since codecpar ↵Michael Niedermayer
the codec flags are not available to the muxer anymore Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-11Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'Derek Buitenhuis
* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7': examples/output: convert to codecpar Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-10-15doc/examples/muxing: Fix mixed declaration and codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-14Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'Hendrik Leppkes
* commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e': avformat: Do not use AVFMT_RAWPICTURE Removal from ffmpeg.c not merged because some parts of avdevice still use it Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-01-08doc/examples/muxing: Use avio_closep() in examples as it avoids leaving ↵Michael Niedermayer
stale pointers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: fix "-flags" optionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: Exchange tmp_frame and frameMichael Niedermayer
Reduces difference to 56f98e340fca894a76d1ddbe33118b8d8c4db34a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: mark correct frame as writeableMichael Niedermayer
Bug found from comparing 56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: Always use swr, simplifies code slightlyMichael Niedermayer
Idea-from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: add alloc_audio_frame() and use it to simplify code.Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: Move samples_count to OutputStreamMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: free swr context at the endMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: Support setting flags, for example for setting bitexactMichael Niedermayer
This would allow the example to be used in regression tests Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: select a supported sample rate for the encoder, favor 44100Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27doc/examples/muxing: pick a supported channel layout if stereo isnt ↵Michael Niedermayer
supported by the encoder Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-26doc/examples/muxing: move swr context to OutputStreamMichael Niedermayer
Idea from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-26Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'Michael Niedermayer
* commit '884f7c975f0af25febe86660e87bf3b2165a0309': output example: set the stream timebase Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28doc/examples/muxing: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'Michael Niedermayer
* commit '182d3f8221c23716ea4eafa460bdb94968f71f26': output example: rewrite encoding logic Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'Michael Niedermayer
* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11': output example: store the scaling context in the stream context Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'Michael Niedermayer
* commit '6a927d7aaf5625e83a674072913b9e292a303fd1': output example: use a macro instead of a static variable Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'Michael Niedermayer
* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb': output example: allocate the audio frame only once Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'Michael Niedermayer
* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb': output example: use OutputStream for audio streams as well Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'Michael Niedermayer
* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38': output example: use the new AVFrame API to allocate audio frames Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'Michael Niedermayer
* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594': output example: set output channel layout Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'Michael Niedermayer
* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3': output example: use a struct to bundle the video stream variables together Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26Merge commit '38d044429dabcd28928693240e955c6d4430cca9'Michael Niedermayer
* commit '38d044429dabcd28928693240e955c6d4430cca9': output example: use the new AVFrame API for allocating the video frame Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'Michael Niedermayer
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251': Use av_packet_rescale_ts() to simplify code. Conflicts: doc/examples/muxing.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17doc/examples: remove pathes from doxy examplesMichael Niedermayer
This makes the examples page less cluttered Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: doc/examples: misc Doxygen markup improvements Conflicts: doc/examples/muxing.c doc/examples/transcode_aac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-23examples/muxing: reindent after previous commitStefano Sabatini
2014-01-23examples/muxing: flush encoders at the endStefano Sabatini
2014-01-21examples/muxing: reduce duration, remove wrong and misleading commentStefano Sabatini
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.
2014-01-20examples/muxing: remove redundant {}Stefano Sabatini
2014-01-20examples/muxing: change error checks, from "ret != 0" to "ret < 0"Stefano Sabatini
More consistent and more future-proof.
2014-01-20examples/muxing: factorize write_interleave codeStefano Sabatini
Also log output packet information.
2014-01-12examples/muxing: simplify video PTS settingStefano Sabatini
Rely on frame_count. Also more consistent with audio path.
2014-01-09doc/examples/muxing: Fixes frame initialization.Andre Anjos
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 <michaelni@gmx.at>
2014-01-09examples/muxing: set timestamps in output audio packetStefano Sabatini
In particular, fix trac ticket #3231.
2014-01-09examples/muxing: use av_frame_free() in place of av_free()Stefano Sabatini
2014-01-09examples/muxing: reuse global audio frameStefano Sabatini
Simplify logic, avoid multiple unnecessary alloc/free operations.
2014-01-09examples/muxing: honour distinction between encoder PTS timebase and stream ↵Stefano Sabatini
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.
2014-01-09examples/muxing: set sample formats from list of codec supported sample formatsStefano Sabatini
Avoid the need of tweaking, also show how to get list of supported sample formats.
2013-12-21examples/muxing: fix memleaks in resamplerIlya Basin
- 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 <michaelni@gmx.at>
2013-12-21examples/muxing: use S16 sample_fmt for resample src regardless of codec ↵Ilya Basin
sample_fmt We generate S16 samples and we should allocate the right buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21examples/muxing: fix av_frame_free() not called when got_packet is falseIlya Basin
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 <michaelni@gmx.at>
2013-12-12Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'Michael Niedermayer
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9': Replace all uses of avcodec_free_frame with av_frame_free(). Conflicts: doc/examples/decoding_encoding.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 06:58:20 +0300