virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
117,127 Commits 37 Branches 400 Tags 463 MiB
e19551d165
Commit Graph

576 Commits

Author SHA1 Message Date
Matthieu Bouron
400378b7b3 doc/examples/extract_mvs: re-indent after previous commit 2017-04-04 14:10:22 +02:00
Matthieu Bouron
1cf93196fc doc/examples/extract_mvs: make pkt local to the main function 2017-04-04 14:10:22 +02:00
Matthieu Bouron
82116bd8a4 doc/examples/extract_mvs: switch to new decoding API 2017-04-04 14:10:22 +02:00
Clément Bœsch
6db36a0227 Merge commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802' 
* commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802':
  examples/encode_video: allocate the packet dynamically

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:48:23 +02:00
Clément Bœsch
4ea942f2ce Merge commit '5f102a9559099429826e84758b8b5182244c52db' 
* commit '5f102a9559099429826e84758b8b5182244c52db':
  examples/encode_video: switch to the new encoding API

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:44:45 +02:00
Clément Bœsch
dd0113da3c Merge commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb' 
* commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb':
  examples/decode_audio: flush the decoder

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:40:34 +02:00
Clément Bœsch
d1105e8f43 Merge commit '9a38184a143a1560814b084aebe628f8df46e666' 
* commit '9a38184a143a1560814b084aebe628f8df46e666':
  examples/decode_audio: allocate the packet dynamically

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:38:56 +02:00
Clément Bœsch
3d12d10677 Merge commit '3d66717f7cb5555257244be8f5bce172ed3af7ac' 
* commit '3d66717f7cb5555257244be8f5bce172ed3af7ac':
  examples/decode_audio: use the new audio decoding API

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:33:04 +02:00
Clément Bœsch
87e16e2b44 Merge commit '0946c754d99c05413e813ee515039adcf0f9232a' 
* commit '0946c754d99c05413e813ee515039adcf0f9232a':
  examples/decode_audio: use a parser for splitting the input

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:27:37 +02:00
Clément Bœsch
34ec327f69 examples/decode_audio: reduce the scope of 2 variables 2017-04-04 11:17:35 +02:00
Clément Bœsch
a434657de9 Merge commit 'f27e262dbdea1991b22e08b639ac03e642a3482c' 
* commit 'f27e262dbdea1991b22e08b639ac03e642a3482c':
  examples/encode_audio: switch to the new audio encoding API

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 21:14:16 +02:00
Clément Bœsch
54e195cf52 Merge commit '44c9f374f188f92927b7a4aad2101289d446b814' 
* commit '44c9f374f188f92927b7a4aad2101289d446b814':
  examples/qsvdec: convert to the new decoding API

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 21:10:07 +02:00
Clément Bœsch
4069394fd4 Merge commit '1dd2b6c91ca5f26207805720d4f5564de60b241b' 
* commit '1dd2b6c91ca5f26207805720d4f5564de60b241b':
  examples/qsvdec: switch to the hwcontext API

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 21:07:59 +02:00
Clément Bœsch
e181e2909b doc/examples/transcode_aac: replace local get_error_text with av_err2str 2017-04-01 12:45:33 +02:00
James Almer
b27dd80255 doc/decode_audio: use <> to include libav* headers 
Found-by: ubitux
 2017-03-31 16:50:51 -03:00
James Almer
ebe9808aaa Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b' 
* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-31 15:46:13 -03:00
Michael Niedermayer
59b8c2a4e6 doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate 
This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 16:34:06 +02:00
Matthieu Bouron
03372d0a90 doc/examples/filtering_audio: switch to new decoding API 2017-03-30 16:20:13 +02:00
Matthieu Bouron
afd257b43f doc/examples/filtering_video: switch to new decoding API 2017-03-30 16:20:07 +02:00
Clément Bœsch
fdbc29ca70 Merge commit '8191f960a669819db4de33a2439ded1630b8a73e' 
* commit '8191f960a669819db4de33a2439ded1630b8a73e':
  examples/decode_video: constify the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:22:32 +02:00
Clément Bœsch
58f24adc05 Merge commit '5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c' 
* commit '5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c':
  examples/encode_video: use the AVFrame API for allocating the frame

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:21:52 +02:00
Clément Bœsch
944e5ce3ec doc/examples/{de,en}code_audio: fix includes 
Consistent with other examples.
 2017-03-29 14:18:10 +02:00
Clément Bœsch
4726bbb471 Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83' 
* commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83':
  examples/encode_video: set the framerate

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:16:33 +02:00
Clément Bœsch
e9bd457465 Merge commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4' 
* commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4':
  examples/encode_video: constify the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:15:01 +02:00
Clément Bœsch
925ce244d8 Merge commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d' 
* commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d':
  examples/avcodec: split the remaining two examples into separate files

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:09:09 +02:00
Clément Bœsch
dcdd52101f Merge commit '90265814f993098d79b0a0f40745ecdb403fbf56' 
* commit '90265814f993098d79b0a0f40745ecdb403fbf56':
  examples/decode_audio: constify the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:45:51 +02:00
Clément Bœsch
9bed10afb8 doc/examples/encode_audio: add missing return 2017-03-29 13:45:09 +02:00
Clément Bœsch
878070cc56 Merge commit 'f5df897c4b61985e3afc89ba1290649712ff438e' 
* commit 'f5df897c4b61985e3afc89ba1290649712ff438e':
  examples/avcodec: split audio decoding into a separate example

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:43:47 +02:00
Clément Bœsch
780cc080d8 Merge commit 'f76698e759a08e8d3b629c06edb0439f474e7fee' 
* commit 'f76698e759a08e8d3b629c06edb0439f474e7fee':
  examples/encode_audio: use the AVFrame API for allocating the data

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:31:44 +02:00
Clément Bœsch
f38e7566c6 Merge commit 'c00a11ab383ff276a2ab2fdba577945e48d465be' 
* commit 'c00a11ab383ff276a2ab2fdba577945e48d465be':
  examples/encode_audio: constify AVCodec instances

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:30:16 +02:00
Clément Bœsch
b785af4868 Merge commit '40aaa8dadfd1c69ff4460d04750e1403b5535a6d' 
* commit '40aaa8dadfd1c69ff4460d04750e1403b5535a6d':
  examples/avcodec: split audio encoding into a separate example

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:29:22 +02:00
James Almer
3b80f73b18 doc/examples/transcoding: convert to codecpar 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-28 12:27:04 -03:00
Matthieu Bouron
64b5539985 doc/examples/extract_mvs: switch to codecpar 2017-03-28 17:46:29 +02:00
Matthieu Bouron
4a946aca7c doc/examples/remuxing: switch to codecpar 
Also limits remuxing to audio, video and subtitle streams.
 2017-03-28 17:46:23 +02:00
Matthieu Bouron
7e3e0f87e6 doc/examples/muxing: re-indent block 2017-03-28 12:41:46 +02:00
Clément Bœsch
c3706bc255 doc/examples/filtering_*: switch to codecpar 2017-03-28 11:40:57 +02:00
Diego Biurrun
c483398bb7 build: Drop DOC_ prefix from EXAMPLES-related variables 2017-02-27 13:57:35 +01:00
Diego Biurrun
ab566cc96b build: Separate logic for building examples from that for building avtools 2017-02-21 16:10:51 +01:00
Diego Biurrun
acb0dea27e build: Split logic for building examples off into a separate Makefile 2017-02-21 16:10:51 +01:00
Clément Bœsch
126e96533f Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2' 
* commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2':
  examples: Properly free AVCodecContext

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-01-31 17:35:41 +01:00
Rostislav Pehlivanov
e05d2dd86a doc/examples/decoder_targeted: move to tools/target_dec_fuzzer.c 
Name and purpose are more appropriate there since the code isn't
an ideal example.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-01-29 16:14:18 +00:00
Michael Niedermayer
bbd4d92304 doc/examples/decoder_targeted: Disable error concealment after 20 frames 
This allows testing EC and non EC. Avoids spending most time in EC on
high res samples and reduces the likelyhood of hitting timeouts

Fixes: Timeout in 467/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_H263_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-29 16:09:55 +01:00
Michael Niedermayer
89d4d7d759 doc/examples/http_multiclient: Fix resource leak 
Fixes CID1396269

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-26 18:29:00 +01:00
Michael Niedermayer
99af260d0b doc/examples/decoder_targeted: Limit max pixels for fuzzing 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-19 19:59:06 +01:00
Aleksandr Slobodeniuk
a91f1023bc examples: fix a typo in an error message 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-02 11:59:08 -05:00
Александр Слободенюк
3aa1ff30f3 doc/examples/transcode_aac: fix a typo 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-01 12:53:45 +01:00
Anton Khirnov
c7ab0eb305 examples/decode_video: allocate the packet dynamically 
AVPackets on stack are discouraged.
 2016-11-23 13:11:17 +01:00
Anton Khirnov
728ea23cce examples/decode_video: switch to the new decoding API 2016-11-23 13:10:54 +01:00
Anton Khirnov
f78d360bba examples/decode_video: use a parser for splitting the input 
Do not rely on the decoder handling this, as it's not guaranteed to
work.
 2016-11-23 13:10:28 +01:00
Anton Khirnov
59ab9e8ba1 examples/encode_video: allocate the packet dynamically 
AVPackets on stack are discouraged.
 2016-11-23 13:10:22 +01:00
Anton Khirnov
5f102a9559 examples/encode_video: switch to the new encoding API 2016-11-23 13:10:16 +01:00
Anton Khirnov
fee0f1de2c examples/decode_audio: flush the decoder 2016-11-23 13:10:10 +01:00
Anton Khirnov
9a38184a14 examples/decode_audio: allocate the packet dynamically 
AVPackets on stack are discouraged now.
 2016-11-23 13:10:05 +01:00
Anton Khirnov
45a1ce2ff7 examples/decode_audio: handle planar audio now produced by the MP2 decoder 2016-11-23 13:10:00 +01:00
Anton Khirnov
3d66717f7c examples/decode_audio: use the new audio decoding API 2016-11-23 13:09:55 +01:00
Anton Khirnov
0946c754d9 examples/decode_audio: use a parser for splitting the input 
Do not rely on the decoder handling this, as it's not guaranteed to
work.
 2016-11-23 13:09:41 +01:00
Anton Khirnov
f27e262dbd examples/encode_audio: switch to the new audio encoding API 2016-11-23 13:08:50 +01:00
Anton Khirnov
44c9f374f1 examples/qsvdec: convert to the new decoding API 2016-11-23 13:08:43 +01:00
Anton Khirnov
1dd2b6c91c examples/qsvdec: switch to the hwcontext API 
The code now does not depend on VA and will work on windows as well.
 2016-11-23 13:08:33 +01:00
Sam Hocevar
3115550abe doc/examples/muxing: Fix av_frame_make_writable usage 
This patch moves the av_frame_make_writable() call from fill_yuv_image
to get_video_frame so that its argument can be the actual frame that
will be sent to the encoder.

This fixes data corruption issues in codecs that keep references on
one or several previous frames.

Signed-off-by: Sam Hocevar <sam@hocevar.net>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-23 03:28:04 +01:00
Diego Biurrun
bb265b764a examples/transcode_aac: Drop pointless return value const qualifier 
doc/examples/transcode_aac.c:52:20: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 2016-11-17 16:53:47 +01:00
Diego Biurrun
bfe92dfe60 Ignore all generated example binaries 2016-11-17 10:35:27 +01:00
Diego Biurrun
905cdcaa9d examples/decode_audio: Add missing header for av_free() 2016-11-10 10:33:19 +01:00
Thomas Garnier
c06d923410 doc/examples: add fuzz target for individual ffmpeg APIs for in-process fuzzing with libFuzzer, AFL, and similar fuzzing engines. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-04 22:42:20 +01:00
Anton Khirnov
636515c324 examples/decode_video: remove a stray unrelated comment 2016-11-02 10:20:41 +01:00
Anton Khirnov
8191f960a6 examples/decode_video: constify the AVCodec instance 2016-11-02 10:20:25 +01:00
Anton Khirnov
5b4d7ac7ae examples/encode_video: use the AVFrame API for allocating the frame 
It is more efficient and so preferred over allocating the buffers
manually.
 2016-11-02 10:20:01 +01:00
Anton Khirnov
d0a603a534 examples/encode_video: set the framerate 2016-11-02 10:19:37 +01:00
Anton Khirnov
e02524025b examples/encode_video: constify the AVCodec instance 2016-11-02 10:18:34 +01:00
Anton Khirnov
7b1f03477f examples/avcodec: split the remaining two examples into separate files 2016-11-02 10:16:04 +01:00
Anton Khirnov
90265814f9 examples/decode_audio: constify the AVCodec instance 2016-11-02 10:13:37 +01:00
Anton Khirnov
f5df897c4b examples/avcodec: split audio decoding into a separate example 
The four examples (audio/video encoding/decoding) are completely
independent so it makes little sense to have them all in one file.
 2016-11-02 10:13:27 +01:00
Anton Khirnov
f76698e759 examples/encode_audio: use the AVFrame API for allocating the data 
It is simpler and more efficient.
 2016-11-02 10:12:39 +01:00
Anton Khirnov
c00a11ab38 examples/encode_audio: constify AVCodec instances 2016-11-02 10:11:48 +01:00
Anton Khirnov
40aaa8dadf examples/avcodec: split audio encoding into a separate example 
The four examples (audio/video encoding/decoding) are completely
independent so it makes little sense to have them all in one file.
 2016-11-02 10:11:46 +01:00
Michael Niedermayer
2bd9956454 doc/examples/demuxing_decoding: Drop AVFrame->pts use 
This code is not correct for git master

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-18 15:15:12 +02:00
Michael Niedermayer
7ba7b96dd3 doc/examples/http_multiclient: Fix "doc/examples/http_multiclient.c:43:9: warning: passing argument 4 of av_opt_get from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-09 00:32:39 +02:00
Clément Bœsch
1a9b4bc4c7 doc/examples: build http_multiclient example 2016-09-30 19:35:52 +02:00
Clément Bœsch
1e647d200f doc/examples/gitignore: add forgotten qsvdec entry 2016-09-30 19:35:52 +02:00
Clément Bœsch
f2579f7ee2 doc/examples/http_multiclient: fix mixed declarations and code 2016-09-30 19:35:52 +02:00
Clément Bœsch
fb5e58cd77 doc/examples/http_multiclient: fix compilation 
Fixes error: no previous prototype for ‘process_client’ [-Werror=missing-prototypes]
 2016-09-30 19:35:52 +02:00
Anton Khirnov
67d28f4a0f examples/output: switch to the new encoding API 2016-09-28 10:01:52 +02:00
James Almer
bba6a03b28 examples/demuxing_decoding: convert to codecpar 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-08-17 19:17:04 -03:00
Vittorio Giovara
9833a406d3 examples: Properly free AVCodecContext 2016-07-20 17:13:53 +02:00
Clément Bœsch
5558ff3a9f Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801' 
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 11:28:51 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Michael Niedermayer
3bc060f366 doc/examples/transcoding: Use the decoders pixel format if the encoder does not list which are supported 
This affects rawvideo and wraped_avframe, no others are affected atm

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-05 17:10:15 +02:00
Diego Biurrun
257f00ec1a Split global .gitignore file into per-directory files 2016-05-13 14:55:56 +02:00
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Michael Niedermayer
0c79c96cf2 doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 17:57:06 +02:00
Derek Buitenhuis
6bc5ef37cb Merge commit 'ac6d53589f3631ae08467c784fb371a15c957f01' 
* commit 'ac6d53589f3631ae08467c784fb371a15c957f01':
  examples/transcode_aac: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:15:28 +01:00
Derek Buitenhuis
030e69b4dc Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a' 
* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
  examples/qsvdec: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:07:41 +01:00
Derek Buitenhuis
d76972b581 Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7' 
* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7':
  examples/output: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:06:43 +01:00
Lou Logan
06eef96b69 fix some a/an typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-03-28 14:13:17 -08:00
Anton Khirnov
ac6d53589f examples/transcode_aac: convert to codecpar 2016-02-24 10:08:34 +01:00
Anton Khirnov
a9e1f2cc61 examples/qsvdec: convert to codecpar 2016-02-24 10:08:30 +01:00
Anton Khirnov
9897d9f4e0 examples/output: convert to codecpar 2016-02-24 10:08:24 +01:00
Hendrik Leppkes
c2f861ca42 Replace remaining occurances of av_free_packet with av_packet_unref 2015-10-27 14:35:30 +01:00
Hendrik Leppkes
7f5af80ba4 Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457' 
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
  avpacket: Replace av_free_packet with av_packet_unref

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-27 14:28:56 +01:00
Luca Barbato
ce70f28a17 avpacket: Replace av_free_packet with av_packet_unref 
`av_packet_unref` matches the AVFrame ref-counted API and can be used as
a drop in replacement.

Deprecate `av_free_packet`.
 2015-10-26 18:00:55 +01:00
Michael Niedermayer
83fc0b9d48 doc/examples/muxing: Fix mixed declaration and code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-15 00:24:00 +02:00
Hendrik Leppkes
1899b25799 Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e' 
* 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-10-14 14:43:20 +02:00
Luca Barbato
34ed5c2e4d avformat: Do not use AVFMT_RAWPICTURE 
There are no formats supporting it anymore and it is deprecated.
Update the documentation accordingly.
 2015-10-13 13:43:29 +02:00
Hendrik Leppkes
b1284a4b4a Merge commit '539e5ac2ecfec2e2f441222a43fb0583643ea607' 
* commit '539e5ac2ecfec2e2f441222a43fb0583643ea607':
  examples/qsvdec: free the lavc decoder before closing MFX/VAAPI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:29 +02:00
Hendrik Leppkes
d0a1605134 Merge commit '3ee462dca1038e63b8e8d5e751121736d5772a5d' 
* commit '3ee462dca1038e63b8e8d5e751121736d5772a5d':
  examples/qsvdec: do not free the surfaces in the frame_free() callback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:23 +02:00
Anton Khirnov
539e5ac2ec examples/qsvdec: free the lavc decoder before closing MFX/VAAPI 
lavc expects MFX to still be in a usable state on close.
 2015-09-28 15:46:10 +02:00
Anton Khirnov
3ee462dca1 examples/qsvdec: do not free the surfaces in the frame_free() callback 
Even though libmfx might not need them anymore, avcodec might still
access the surfaces. So free them separately at the end.
 2015-09-28 15:45:29 +02:00
Clément Bœsch
d9464e9c14 doc/examples/demuxing_decoding: simplify api_mode to refcount 
This finalizes the quick cleanup of a753e6c9f5.
 2015-09-06 12:35:00 +02:00
Michael Niedermayer
a753e6c9f5 doc/examples/demuxing_decoding: Drop old api mode, because the code fails to build otherwise 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-05 18:25:24 +02:00
Hendrik Leppkes
144fb06806 Remove left-over FF_API_AVFILTERBUFFER cruft 2015-09-05 16:27:19 +02:00
Michael Niedermayer
e9c58033e8 doc/examples/http_multiclient: Fix occured typo 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-04 11:30:25 +02:00
Harshit Mittal
53bf32fa42 doc/examples/filtering_video: better demo ffmpeg filters; demos chaining the filters 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-28 12:53:35 +02:00
Mariusz Szczepańczyk
767d780ec0 doc/examples: rename avio_list_dir -> avio_dir_cmd 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-16 02:16:47 +02:00
Mariusz Szczepańczyk
c84d208c27 examples/avio_list_dir: add move and delete methods 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-15 03:32:38 +02:00
Stephan Holljes
25410c524d doc/example: Add http multi-client example code 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:32 +02:00
Michael Niedermayer
29d147c94d Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/4xm.c
	libavcodec/aac_adtstoasc_bsf.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.h
	libavcodec/asvenc.c
	libavcodec/avcodec.h
	libavcodec/avpacket.c
	libavcodec/dvdec.c
	libavcodec/ffv1enc.c
	libavcodec/g2meet.c
	libavcodec/gif.c
	libavcodec/h264.c
	libavcodec/h264_mp4toannexb_bsf.c
	libavcodec/huffyuvdec.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libxvid.c
	libavcodec/mdec.c
	libavcodec/motionpixels.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/noise_bsf.c
	libavcodec/nuv.c
	libavcodec/nvenc.c
	libavcodec/options.c
	libavcodec/parser.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/qsvdec.c
	libavcodec/svq1enc.c
	libavcodec/tiffenc.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/vc1dec.c
	libavcodec/wmalosslessdec.c
	libavformat/adxdec.c
	libavformat/aiffdec.c
	libavformat/apc.c
	libavformat/apetag.c
	libavformat/avidec.c
	libavformat/bink.c
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/id3v2.c
	libavformat/isom.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mpc.c
	libavformat/mpc8.c
	libavformat/mpegts.c
	libavformat/mvi.c
	libavformat/mxfdec.c
	libavformat/mxg.c
	libavformat/nutdec.c
	libavformat/oggdec.c
	libavformat/oggparsecelt.c
	libavformat/oggparseflac.c
	libavformat/oggparseopus.c
	libavformat/oggparsespeex.c
	libavformat/omadec.c
	libavformat/rawdec.c
	libavformat/riffdec.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_qdm2.c
	libavformat/rtpdec_svq3.c
	libavformat/sierravmd.c
	libavformat/smacker.c
	libavformat/smush.c
	libavformat/spdifenc.c
	libavformat/takdec.c
	libavformat/tta.c
	libavformat/utils.c
	libavformat/vqf.c
	libavformat/westwood_vqa.c
	libavformat/xmv.c
	libavformat/xwma.c
	libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 23:15:19 +02:00
Michael Niedermayer
444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* 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-27 22:50:18 +02:00
Michael Niedermayer
94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 
* 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-07-27 22:10:35 +02:00
Vittorio Giovara
059a934806 lavc: Consistently prefix input buffer defines 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:59 +01:00
Vittorio Giovara
def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Vittorio Giovara
7c6eb0a1b7 lavc: AV-prefix all codec flags 
Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Andreas Cadhalpun
dd6c8575db examples/demuxing_decoding: use properties from frame instead of video_dec_ctx 
This is more robust.

And only check if there is actually a frame returned.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-15 18:32:18 +02:00
Andreas Cadhalpun
ed0b1db640 doc: fix spelling errors 
Neccessary -> Necessary
formated   -> formatted
thee       -> the
eventhough -> even though
seperately -> separately

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-14 15:09:33 +02:00
Michael Niedermayer
b8ba2d3915 examples/decoding_encoding: Use the AVFrame width/height for processing images after decoding 
This is what FFmpeg / FFplay do and it is more robust

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 02:14:26 +02:00
Lukasz Marek
f79cd98caf examples/avio_list_dir: init/deinit network 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-04-06 15:50:26 +02:00
Mariusz Szczepańczyk
f10aa0e125 doc/examples: Handle new types in avio_list_dir 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 04:09:40 +02:00
Lukasz Marek
56b7aa2138 doc/examples: add directory listing example 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 03:13:44 +01:00
Michael Niedermayer
e73b3dba3e Merge commit '990e4a6639d0714198583c2812b1074b5751898f' 
* commit '990e4a6639d0714198583c2812b1074b5751898f':
  Add a QSV decoding example.

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-01 00:30:20 +01:00
Anton Khirnov
990e4a6639 Add a QSV decoding example. 2015-02-28 21:51:24 +01:00
Andreas Cadhalpun
078be09dd7 examples/demuxing_decoding: abort decoding when width, height or pix_fmt change 
This is necessary, because avcodec_decode_video2 can change
width, height and/or pixel format of the AVCodecContext. Since
video_dst_data and video_dst_linesize are not updated by calling
av_image_alloc again, av_image_copy[_plane] asserts, because the
destination buffer is too small.

In this case, creating a useable rawvideo is not possible anyway, since
it has fixed width/height/pix_fmt.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-10 02:43:47 +01:00
Andreas Cadhalpun
2a3b7a55b5 examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-31 21:54:36 +01:00
Stefano Sabatini
d43c1ec684 examples/filtering: extend comments about setting the filter graph endpoints 
That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.
 2015-01-29 11:12:39 +01:00
Michael Niedermayer
e5c28d4f9a Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee' 
* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:35:31 +01:00
Michael Niedermayer
d078d57fb7 Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e' 
* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:29:46 +01:00
Michael Niedermayer
010311d673 Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761' 
* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:21:02 +01:00
Andreas Unterweger
3a70c0c95f examples/transcode_aac: generate proper PTS and set the muxer timebase 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:03:08 +01:00
Andreas Unterweger
c9b19ac892 examples/transcode_aac: fix a typo 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:00:23 +01:00
Andreas Unterweger
749a89d1b8 examples/transcode_aac: properly select the output sample format 
Makes the example work with all the supported AAC encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 08:58:47 +01:00
Andreas Cadhalpun
f97f2a3527 doc/examples: fix lib math dep for decoding_encoding 
It uses at least sin().

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 04:50:42 +01:00
Michael Niedermayer
a85f033149 doc/examples/transcoding: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:29:10 +01:00
Michael Niedermayer
a63c17cec7 idoc/examples/remuxing: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:28:59 +01:00
Michael Niedermayer
c61b84ccfd doc/examples/transcode_aac: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:28:51 +01:00
Michael Niedermayer
1d2410639d doc/examples/muxing: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:28:15 +01:00
Piotr Fusik
c99e5191ab doc/examples/filtering_video: fix frame rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 16:52:19 +01:00
Michael Niedermayer
bde27e1e61 doc/examples/transcoding: check encoder before using it 
Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 18:58:38 +01:00
Michael Niedermayer
e6ea75c5e6 doc/examples/decoding_encoding: fix storing all channels 
Fixes Ticket3355

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-24 22:01:33 +01:00
Michael Niedermayer
230aeee94c doc: fix the the typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:09:09 +01:00
Stefano Sabatini
3a0c70f1e3 doc/examples/transcoding: use av_packet_rescale_ts() 
Simplify.
 2014-09-16 14:55:33 +02:00
Michael Niedermayer
68bca03951 doc/examples: remove unneeded NULL checks 
dst_file cannot be NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 16:45:50 +02:00
Clément Bœsch
b0352b1997 avcodec: export motion vectors in frame side data on demand 
The reasoning behind this addition is that various third party
applications are interested in getting some motion information out of a
video "for free" when it is available.

It was considered to export other information as well (such as the intra
information about the block, or the quantization) but the structure
might have ended up into a half full-generic, half full of codec
specific cruft. If more information is necessary, it should either be
added in the "flags" field of the AVMotionVector structure, or in
another side-data.

This commit also includes an example exporting them in a CSV stream.
 2014-08-18 14:13:57 +02:00
Timothy Gu
9f02a2b224 transcode_aac: fix const return value 
Fixes Trac #3613.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-06 04:01:19 +02:00
Michael Niedermayer
f1d6fc7794 Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df' 
* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
  examples: filter_audio: Add missing mem.h header for av_freep()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 19:18:25 +02:00
Diego Biurrun
6a928293dd examples: filter_audio: Add missing mem.h header for av_freep() 2014-08-03 01:29:43 -07:00
Michael Niedermayer
f285056810 doc/examples/muxing: fix "-flags" option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 19:58:47 +02:00
Michael Niedermayer
c437765be7 doc/examples/muxing: Exchange tmp_frame and frame 
Reduces difference to 56f98e340f

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 12:03:51 +02:00
Michael Niedermayer
d1ce43a3e8 doc/examples/muxing: mark correct frame as writeable 
Bug found from comparing 56f98e340f to HEAD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:55:17 +02:00
Michael Niedermayer
fbd46e2f1c doc/examples/muxing: Always use swr, simplifies code slightly 
Idea-from: 56f98e340f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:32:19 +02:00
Anton Khirnov
22e9fe06eb doc/examples/muxing: add alloc_audio_frame() and use it to simplify code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:15:39 +02:00
Michael Niedermayer
a98cadef7f doc/examples/muxing: Move samples_count to OutputStream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:05:05 +02:00
Michael Niedermayer
8b1d54ba40 doc/examples/muxing: free swr context at the end 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 00:50:58 +02:00
Michael Niedermayer
7cf0865551 doc/examples/muxing: Support setting flags, for example for setting bitexact 
This would allow the example to be used in regression tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 22:49:02 +02:00
Michael Niedermayer
5d2cf1ae86 doc/examples/muxing: select a supported sample rate for the encoder, favor 44100 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 22:27:50 +02:00
Michael Niedermayer
ead22f42f4 doc/examples/muxing: pick a supported channel layout if stereo isnt supported by the encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 22:01:08 +02:00
Michael Niedermayer
9ccb9c8df2 doc/examples/muxing: move swr context to OutputStream 
Idea from: 56f98e340f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 21:50:21 +02:00
Michael Niedermayer
1c0c19f8bd Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309' 
* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
  output example: set the stream timebase

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 21:04:31 +02:00
Anton Khirnov
56f98e340f output example: convert audio to the format supported by the encoder 2014-07-26 14:57:59 +00:00
Anton Khirnov
884f7c975f output example: set the stream timebase 
This is required by the new API.
 2014-07-26 14:57:45 +00:00
Diego Biurrun
6cc1409ba8 examples/output: Remove unused variable 
doc/examples/output.c:460:9: warning: unused variable ‘i’
 2014-07-11 07:23:50 -07:00
Timothy Gu
3be90723e7 transcoding: fix Doxygen file path 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 13:15:32 +02:00
Michael Niedermayer
cddbf95c5f doc/examples/resampling_audio: use av_freep() for saftey 
also its better in examples to use the safer functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-29 16:26:38 +02:00
Michael Niedermayer
4d3072ada3 doc/examples/muxing: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 21:44:38 +02:00
Michael Niedermayer
8469c73576 Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26' 
* commit '182d3f8221c23716ea4eafa460bdb94968f71f26':
  output example: rewrite encoding logic

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 00:57:04 +02:00
Michael Niedermayer
9a2850c26a Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11' 
* 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-27 00:16:34 +02:00
Michael Niedermayer
877716a79c Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1' 
* 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-26 23:58:00 +02:00
Michael Niedermayer
5a55d5e445 Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb' 
* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
  output example: allocate the audio frame only once

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 23:22:08 +02:00
Michael Niedermayer
b9bfd888e5 Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb' 
* 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-26 23:01:52 +02:00
Michael Niedermayer
11991a7d90 Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38' 
* 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-26 22:46:11 +02:00
Michael Niedermayer
a1c4635558 Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594' 
* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 22:13:46 +02:00
Michael Niedermayer
8eb1174a9e Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3' 
* 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-26 21:55:11 +02:00
Michael Niedermayer
c9083d85df Merge commit '38d044429dabcd28928693240e955c6d4430cca9' 
* 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-26 21:30:37 +02:00
Anton Khirnov
a5864e9a25 output example: free the muxing format context properly 2014-06-26 16:08:06 +02:00
Anton Khirnov
182d3f8221 output example: rewrite encoding logic 
Properly generate pts for the frames sent to the encoder, avoid
using private and deprecated AVStream.pts.
 2014-06-26 16:07:34 +02:00
Anton Khirnov
a7fcd4122b output example: store the scaling context in the stream context 2014-06-26 16:07:29 +02:00
Anton Khirnov
6a927d7aaf output example: use a macro instead of a static variable 2014-06-26 16:07:23 +02:00
Anton Khirnov
63fd0d866c output example: allocate the audio frame only once 2014-06-26 16:07:08 +02:00
Anton Khirnov
edd5f95764 output example: use OutputStream for audio streams as well 2014-06-26 16:07:02 +02:00
Anton Khirnov
5e7b125b6a output example: use the new AVFrame API to allocate audio frames 2014-06-26 16:06:54 +02:00
Anton Khirnov
ac85f631c9 output example: set output channel layout 2014-06-26 16:06:48 +02:00
Anton Khirnov
294daf71a7 output example: use a struct to bundle the video stream variables together 2014-06-26 16:05:24 +02:00
Anton Khirnov
38d044429d output example: use the new AVFrame API for allocating the video frame 2014-06-26 16:05:19 +02:00
Michael Niedermayer
afa7ab557a Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251' 
* 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-06-20 17:03:58 +02:00
Anton Khirnov
452860d7e0 Use av_packet_rescale_ts() to simplify code. 2014-06-20 14:14:48 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Stefano Sabatini
bf411fffd4 examples: rename avcodec.c to decoding_encoding.c 
Restore the old name, which was more meaningful and consistent with the
names of the other examples.
 2014-04-23 10:32:42 +02:00
Michael Niedermayer
9b467d3cd5 examples/transcoding: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 15:35:14 +02:00
Michael Niedermayer
419800acc4 examples/avio_reading: fix null dereference on error 
Fixed CID1197052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 00:39:58 +02:00
Anshul Maheshwari
6d25e90262 doc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is AV_PICTURE_TYPE_I 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 15:21:15 +01:00
Andrey Utkin
e10ab43614 doc/examples: Add example transcoding.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 20:56:33 +01:00
compn
84bccae8e9 doc: fix typo 2014-03-07 17:07:37 -05:00
Jason Hsu
8fb4dba89d doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 16:10:06 +01:00