summaryrefslogtreecommitdiff
path: root/libavformat/nutenc.c
Commit message (Collapse)AuthorAge
* Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'Michael Niedermayer2015-02-25
|\ | | | | | | | | | | | | * commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a': libavformat: Use ffio_free_dyn_buf where applicable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Use ffio_free_dyn_buf where applicableMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | nutdec: Remove unused variablesTimothy Gu2015-02-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80a11de7dca315505bf203ce9c8c016e71724fd2': nutenc: do not use has_b_frames Conflicts: libavformat/nutenc.c tests/ref/lavf/nut tests/ref/seek/lavf-nut Mostly not merged, this is simply not correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: do not use has_b_framesAnton Khirnov2015-01-27
| | | | | | | | | | It is unreliable, especially when the stream codec context is not the encoding context. Use the codec descriptor properties instead.
* | avformat/nutenc: store the actual r_frame_rate in the corresponding field if ↵Michael Niedermayer2014-12-14
| | | | | | | | | | | | | | | | available Fixes Ticket 3629 part3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'Michael Niedermayer2014-10-22
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba': nutenc: check for negative index rather than assert Conflicts: libavformat/nutenc.c Not merged, the assert is correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: check for negative index rather than assertVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 703721
* | Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | * commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov2014-06-18
| | | | | | | | | | | | It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
* | avformat/nutenc: cleaner version checkMichael Niedermayer2014-06-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: Fix error handling in nut_write_packet()Michael Niedermayer2014-06-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: Fix error handling in write_sm_data()Michael Niedermayer2014-06-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: Suggest genpts if AV_NOPTS_VALUEMichael Niedermayer2014-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: replace conditional by assertMichael Niedermayer2014-05-29
| | | | | | | | | | | | Its implied by sp_count==0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: limit index table size if no index is going to be writtenMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: add mode that omits the indexMichael Niedermayer2014-05-29
| | | | | | | | | | | | | | When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc: avoid av_tree_find() operation per syncpointMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: bump minor version due to broadcast/pipeMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: change check to match commentMichael Niedermayer2014-05-29
| | | | | | | | | | | | The code appears to assume STABLE will never change Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: fix used version valueMichael Niedermayer2014-05-29
| | | | | | | | | | | | | | The broadcast/pipe flags arent stable + 1 they would be 4 or whenever but wouldnt change based on which is stable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c94e2e85cb6af8a570d8542a830556243bd32873': nut: Support experimental NUT 4 features Conflicts: doc/nut.texi libavformat/nut.h libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Support experimental NUT 4 featuresLuca Barbato2014-05-28
| | | | | | | | | | | | | | Add the low overhead pipe mode and the extended broadcast mode. Export the options as 'syncponts' since it impacts only that. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/nutenc: switch to AVFMT_FLAG_BITEXACTMichael Niedermayer2014-05-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: fix missing break in switchMichael Niedermayer2014-01-24
| | | | | | | | | | Fixes CID1163848 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: add support for per frame side & meta data with version 4Michael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: add minor_version field with version>=4Michael Niedermayer2013-12-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: store version in the contextMichael Niedermayer2013-12-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and ↵Michael Niedermayer2013-12-22
| | | | | | | | | | | | | | | | | | | | | | discard the 2nd This fixes an assertion failure and regression and restores previous behaviour Fixes Ticket3197 An alternative would be to fail hard in this case and refuse to mux such data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
| * nut: Fix unchecked allocationsDerek Buitenhuis2013-10-22
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | nut: Fix unchecked allocationsDerek Buitenhuis2013-10-22
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/nutenc: use av_reallocp_array()Paul B Mahol2013-09-14
| | | | | | | | | | | | Fixes memleak on allocation error. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/nutenc: use av_calloc()Paul B Mahol2013-09-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'Michael Niedermayer2013-07-28
|\| | | | | | | | | | | | | * commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d': Remove unreachable returns Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unreachable returnsDiego Biurrun2013-07-27
| |
* | Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'Michael Niedermayer2013-05-06
|\| | | | | | | | | | | | | | | * commit '46c1917350f58dfab84e41919e6c02d43950db8c': nut: use a define for the nut version bgmc: Do not mark ff_bgmc_decode_init() as av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use a define for the nut versionLuca Barbato2013-05-06
| | | | | | | | Ease switching version in the future and make evident why that value.
* | nutenc: only write an index if there are syncpointsMichael Niedermayer2013-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles2012-11-28
| |
* | Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer2012-10-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: verbosely report unsupported negative ptsLuca Barbato2012-10-29
| | | | | | | | Additionally use the correct error number.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: reject unsupported codecs nutenc: K&R formatting cosmetics assdec: fix qsort() callback signature configure: detect sparc64 automatically vp8: fix memset() crossing array boundary h264: fix invalid pointer arithmetic amrwbdec: fix invalid pointer arithmetic Conflicts: libavformat/nutenc.c libavformat/yuv4mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: K&R formatting cosmeticsLuca Barbato2012-10-28
| |
| * nut: export codec_tag provided by rawvideoLuca Barbato2012-10-16
| | | | | | | | | | | | Raw audio does not provide valid audio tags while rawvideo does. The fate refs have to be updated because it undoes the previous tag change.
* | Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd442c276e6688b43777a198cad0d7e3a92123f': nut: prioritize native tags Conflicts: tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: prioritize native tagsLuca Barbato2012-10-13
| | | | | | | | | | Use native tags instead of avi ones, simplifies a lot raw video codecs handling.
* | mux/nut: factorize ff_choose_timebase() out of nutMichael Niedermayer2012-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 17:32:35 +0000