summaryrefslogtreecommitdiff
path: root/libavformat/mp3enc.c
Commit message (Collapse)AuthorAge
* avformat/mp3enc: Assert that the header we assembled is validMichael Niedermayer2016-02-07
| | | | | | | | | | Silences: CID1351343 The header is calculated by the code above the changed hunk, it is thus asserted that the header is always correct. Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c'Hendrik Leppkes2016-01-01
|\ | | | | | | | | | | | | * commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c': mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_headerAnton Khirnov2015-12-12
| | | | | | | | | | | | Almost all the places from which this function is called already check the header manually and in the two that don't (the mp3 muxer) the check should not cause any problems.
* | avformat: use AV_OPT_TYPE_BOOL in a bunch of placesClément Bœsch2015-12-04
| |
* | Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'Hendrik Leppkes2015-10-27
|\| | | | | | | | | | | | | * commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457': avpacket: Replace av_free_packet with av_packet_unref Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avpacket: Replace av_free_packet with av_packet_unrefLuca Barbato2015-10-26
| | | | | | | | | | | | | | `av_packet_unref` matches the AVFrame ref-counted API and can be used as a drop in replacement. Deprecate `av_free_packet`.
| * Drop the unofficial extension prefix for MPEG and MPEG-TS formatsFlorent Le Coz2014-12-02
| | | | | | | | | | | | | | | | As per the RFCs: http://tools.ietf.org/html/rfc3555#page-38 http://tools.ietf.org/html/rfc3003 CC: libav-stable@libav.org
* | id3v2: prefer TDRC for date over TDRL.Benoit Fouet2014-11-04
| | | | | | | | | | | | | | | | | | | | | | | | | | TDRL is what we used as a replacement of TYER, and, according to http://id3.org/id3v2.4.0-changes : TYER - Year This frame is replaced by the TDRC frame, 'Recording time' [F:4.2.5]. So change TDRL usages to TDRC. Fixes ticket #3694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname ↵Michael Niedermayer2014-10-24
| | | | | | | | | | | | instead of randomly truncating Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'Michael Niedermayer2014-10-24
|\| | | | | | | | | | | | | | | | | | | * commit 'ef363ebd596da18f889a7d4845023a23dfac84c9': mp3enc: write full LAME frame Conflicts: libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: write full LAME frameAnton Khirnov2014-10-24
| | | | | | | | Most importantly, it contains the encoder delay and replaygain info.
* | avformat/mp3enc: use initial_paddingMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mp3enc: don't abort if audio packets can't be bufferedJames Almer2014-08-27
| | | | | | | | | | | | | | Instead skip the picture streams and flush the queued audio packets. Should address ticket #3851. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'Michael Niedermayer2014-06-23
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f2f2e7627f0c878d13275af5d166ec5932665e28': Check mp3 header before calling avpriv_mpegaudio_decode_header(). Conflicts: libavformat/mp3enc.c See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Check mp3 header before calling avpriv_mpegaudio_decode_header().Justin Ruggles2014-06-22
| | | | | | | | | | | | | | | | As indicated in the function documentation, the header MUST be checked prior to calling it because no consistency check is done there. CC:libav-stable@libav.org
* | Fix the mime types for MPEG and MPEG-TS formatsFlorent Le Coz2014-05-22
| | | | | | | | | | | | As per the RFCs: http://tools.ietf.org/html/rfc3555#page-38 http://tools.ietf.org/html/rfc3003
* | avformat/mp3enc: switch to AVFMT_FLAG_BITEXACTMichael Niedermayer2014-05-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3enc: drop redundant and uninitialized variableMichael Niedermayer2014-04-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'Michael Niedermayer2014-04-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03': mp3enc: Properly write bitrate value in XING header Conflicts: libavformat/mp3enc.c See: 40176fc3149bc72c1309f93989a57aec2322e626 See: d62bf5d4e73250295c0a652e151498c5b19cbd63 See: various others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: Properly write bitrate value in XING headerMichael Niedermayer2014-04-12
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using a fixed bitrate_idx, calculate a matching bitrate for the XING header. Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1) to report wrong bitrate and bitrate mode when using CBR. Bug-Id: https://bugs.debian.org/736088 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/mp3enc: use av_copy_packet()Michael Niedermayer2014-03-22
| | | | | | | | | | | | | | Fixes double free Fixes Ticket3476 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: use metadata_header_paddingJames Darnley2014-01-24
| | | | | | | | | | | | | | As with the change to flacenc this allows the user to control the amount of padding they want added to the file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'Michael Niedermayer2014-01-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '33018907bd07b34e0e70d5ae12097265eb3734d7': mp3enc: allow omitting the id3v2 header with -id3v2_version 0 Conflicts: doc/muxers.texi libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: allow omitting the id3v2 header with -id3v2_version 0Anton Khirnov2014-01-17
| |
* | Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'Michael Niedermayer2014-01-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd': mp3enc: add an option for disabling the Xing frame. Conflicts: doc/muxers.texi libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: add an option for disabling the Xing frame.Anton Khirnov2014-01-17
| |
* | avformat: remove duplicate includesMichael Niedermayer2013-09-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | * commit 'c0779a67e85df856904ee6fab760c4233d4c2be5': mp3: add .mpa extension Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3: add .mpa extensionVittorio Giovara2013-09-12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-08
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | lavf/mp3enc: make sure the header is valid before writing audio pkt.Clément Bœsch2012-11-16
| | | | | | | | | | An invalid header can lead avpriv_mpegaudio_decode_header() to overread and/or div by zero.
* | mp3enc: remove unneeded null ptr checkMichael Niedermayer2012-10-16
| | | | | | | | | | Fixes: CID733746 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: fix signed C99 overflowMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: merge mp2/mp3_write_trailerMichael Niedermayer2012-09-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: move mp3_update_xing() downMichael Niedermayer2012-09-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'Michael Niedermayer2012-09-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b': avformat: fix typo in avformat_close_input mp3enc: write Xing TOC mp3enc: support MPEG-2 and MPEG-2.5 in Xing header. mp3enc: downgrade some errors in writing Xing frame to warnings lavf: flush the output AVIOContext in av_write_trailer(). lavf: cosmetics, reformat av_write_trailer(). avio: flush the internal buffer in avio_close() Enhance doc on asyncts audiofilter cmdutils: avoid setting data pointers to invalid values in alloc_buffer() libavcodec: remove av_destruct_packet_nofree() Conflicts: libavcodec/avpacket.c libavformat/mp3enc.c libavformat/nutenc.c libavformat/utils.c libavformat/version.h tests/ref/lavf/voc tests/ref/lavf/voc_s16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: write Xing TOCAnton Khirnov2012-09-15
| | | | | | | | | | | | | | | | | | | | | | | | Based on the code by: Peter Belkner <pbelkner@snafu.de>, Michael Niedermayer <michaelni@gmx.at>, Clément Bœsch <clement.boesch@smartjog.com>, Reimar Döffinger <Reimar.Doeffinger@gmx.de>, and Tobias Rapp <t.rapp@noa-audio.com> Alex Converse <alex.converse@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mp3enc: support MPEG-2 and MPEG-2.5 in Xing header.Clément Bœsch2012-09-15
| |
| * mp3enc: downgrade some errors in writing Xing frame to warningsReimar Döffinger2012-09-15
| | | | | | | | Also clarify the meaning of the log message.
| * mp2 muxer: mark as AVFMT_NOTIMESTAMPS.Carl Eugen Hoyos2012-09-07
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | mp3enc: fix const correctnessMichael Niedermayer2012-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: fix CODEC_ID/CodecID that leaked in from older patchMichael Niedermayer2012-08-11
| | | | | | | | | | Found-by: jamal <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3/mp2: identify the video codecs as APIC through query_codec.Michael Niedermayer2012-08-10
| | | | | | | | | | | | Fixes Ticket1408 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-25 10:14:08 +0000