summaryrefslogtreecommitdiff
path: root/libavformat/flvenc.c
Commit message (Collapse)AuthorAge
...
* | avformat/flvenc: check that the codec_tag fits in the available bitsAndreas Cadhalpun2015-02-28
| | | | | | | | | | | | | | flags is later written with avio_w8 and if it doesn't fit in one byte it triggers an av_assert2. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: accept AVMEDIA_TYPE_SUBTITLE instead of DATA for subtitlesMichael Niedermayer2015-01-22
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: omit more metadata elements with specific meaningMichael Niedermayer2015-01-05
| | | | | | | | | | Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Print a warning if vp6 is muxed into flv: The output is flipped.Carl Eugen Hoyos2014-11-23
| | | | | | | | Fixes ticket #4132.
* | avformat/flvenc: remove unused variableMichael Niedermayer2014-11-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c64f3615118d757dcf76040fe5407bf2b3883206'Michael Niedermayer2014-11-17
|\| | | | | | | | | | | | | * commit 'c64f3615118d757dcf76040fe5407bf2b3883206': flvenc: Send new metadata when FLAG_METADATA_UPDATED is set. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.Andrew Stone2014-11-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'Michael Niedermayer2014-11-17
|\| | | | | | | | | | | | | | | | | | | * commit '4d0cd5f58c892276716f46f4b2702915e5018215': flvenc: move metadata updates into a single function Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: move metadata updates into a single functionAndrew Stone2014-11-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/flvenc: Use AVFormatContext strict_std_compliance instead of ↵Michael Niedermayer2014-11-06
| | | | | | | | | | | | AVCodecContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/flvenc: fail in case the muxed packet is too bigStefano Sabatini2014-11-03
| | | | | | | | | | | | Avoid the creation of files which cannot be successfully decoded by ffmpeg, for example generated with: ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv
* | avformat/flvenc: fix codec_id_text checkMichael Niedermayer2014-10-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: When using "-c:d copy", don't require a codec for passing ↵Jeffrey Wescott2014-09-30
| | | | | | | | the AMF metadata through from input to output.
* | align and correct messages regarding bitstream filtersMoritz Barsnick2014-08-19
| | | | | | | | | | | | | | The messages regarding the recommended use of bitstream filters are somewhat different. This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74bc9458057f07c0820c3d3264396c4c64442e47': flvenc: Don't over-count metadata. Conflicts: tests/ref/lavf/flv_fmt tests/ref/vsynth/vsynth1-flashsv tests/ref/vsynth/vsynth1-flv tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Don't over-count metadata.Josh Allmann2014-06-17
| | | | | | | | | | | | Over-counting occurs if framerate is not set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial ↵Michael Niedermayer2014-06-07
| | | | | | | | | | | | | | format extensions being enabled. Found-by: Jean-Baptiste Kempf <jb@videolan.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: fix assertion failure after 4h muxingMichael Niedermayer2014-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43e7f0797f9f821a3866a20f05e512e13c82076a': flvenc: only write the framerate tag based on avg_frame_rate Conflicts: tests/ref/lavf/flv_fmt tests/ref/seek/lavf-flv_fmt tests/ref/seek/vsynth2-flv tests/ref/vsynth/vsynth1-flashsv tests/ref/vsynth/vsynth1-flv tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: only write the framerate tag based on avg_frame_rateAnton Khirnov2014-05-29
| | | | | | | | | | Do not fall back on the codec timebase, since that can be anything for VFR video.
* | Warn if s16be is muxed into flv.Carl Eugen Hoyos2014-01-16
| | | | | | | | | | Players that conform to the specification can only playback such files correctly on big-endian hardware.
* | Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'Michael Niedermayer2013-12-21
|\| | | | | | | | | | | | | * commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30': flv: Use the correct type to hold the file offset Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Use the correct type to hold the file offsetLuca Barbato2013-12-20
| |
* | Revert: flvenc: Don't pretend to support muxing "plain" VP6Carl Eugen Hoyos2013-12-09
| | | | | | | | | | | | Muxing VP6 is used by applications and works with Flashplayer. Reported-by: David Bertrand
* | Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'Michael Niedermayer2013-10-10
|\| | | | | | | | | | | | | | | | | | | * commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90': flvenc: Write proper cropping for VP6 even if there's no extradata Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Write proper cropping for VP6 even if there's no extradataMartin Storsjö2013-10-10
| | | | | | | | | | | | This keeps cropping when remuxing from F4V to FLV. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'Michael Niedermayer2013-10-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'be1e1373d267bae2af8a62d79eef736736f24565': flvenc: Support muxing VP6A as well Conflicts: libavformat/flvenc.c See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Support muxing VP6A as wellMartin Storsjö2013-10-10
| | | | | | | | | | | | Handle it in the same way as VP6F, except for the codec tag. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'Michael Niedermayer2013-10-10
|\| | | | | | | | | | | | | | | | | | | * commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b': flvenc: Don't pretend to support muxing "plain" VP6 Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Don't pretend to support muxing "plain" VP6Martin Storsjö2013-10-10
| | | | | | | | | | | | | | | | The plain VP6 format is vertically flipped compared to VP6F/VP6A. Support for the plain VP6 format was added in 09d8c0ae831 (which also introduced support for muxing VP6F properly in general). Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Don't explicitly flush after each written packet in muxersClément Bœsch2013-09-16
| | | | | | | | | | | | | | | | Since 596e5d4783, this is not necessary anymore. It also allows to actually disable the flushing, improving write performance (but possibly giving worse latency in real-time streaming). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-16
|\| | | | | | | | | | | | | | | * qatar/master: cmdutils: Fix build with lavfi disabled flvenc: do not mux more than one stream per type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: do not mux more than one stream per typeRafaël Carré2013-04-16
| | | | | | | | | | | | FLV does not support multiple audio or video streams. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | flvenc: dont call avio_flush() unconditionalMichael Niedermayer2013-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Only test the first frame for missing aac_adtstoasc bistream filter.Carl Eugen Hoyos2013-03-26
| | | | | | | | | | | | | | Many players ignore broken aac frames, so don't abort mov or flv muxing when encountering one, just print a warning instead. Fixes ticket #2380.
* | Merge commit 'a925f723a915bc0255e2673f8817af5212131763'Michael Niedermayer2012-12-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a925f723a915bc0255e2673f8817af5212131763': rtp: Don't read priv_data unless it is allocated flvenc: Check whether seeking back to the header succeeded sapenc: Pass the title on to the chained muxers Conflicts: libavformat/flvenc.c libavformat/sapenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Check whether seeking back to the header succeededBjörn Axelsson2012-12-20
| | | | | | | | | | | | | | | | The FLV muxer tries to update the header in write_trailer, which is impossible if writing to a pipe or network stream. Don't write header data if seeking to the header fails. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Fix "bistream" typo and add a check in tools/patcheck.Clément Bœsch2012-12-18
| |
* | flvenc: don't write random data if seek failsBjörn Axelsson2012-12-13
| | | | | | | | | | | | | | | | The FLV muxer tries to update the header in write_trailer, which is impossible if writing to a pipe or network stream. Don't write header data if seek to header fails. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Remove non-compiling and/or silly commented-out printf/av_log ↵Diego Biurrun2012-10-01
| | | | | | | | statements
| * flvenc: silence bogus warningBenjamin Larsson2012-09-18
| | | | | | | | | | | | | | | | | | The compiler fails to figure out that enc->codec_type can only have 3 different values. Thus when an if/else is encountered it triggers on the possibility of the else case has not initialized the flags variable. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavf/flvenc: convert commented debug log to an av_dlog callStefano Sabatini2012-09-11
| | | | | | | | Also add some additional info (DTS and DTS time).
* | lavf/flvenc: apply various log fixes/clarificationsStefano Sabatini2012-09-06
| | | | | | | | Should improve user feedback in case of errors.
* | lavf/flvenc: return meaningful error codesStefano Sabatini2012-09-06
| |
* | flvenc: kill a uninitialized variable warning.Michael Niedermayer2012-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Improve descriptiveness of a number of codec and container long namesDiego Biurrun2012-07-30
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 05:47:10 +0000