summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* timecode: move timecode muxer options to metadata.Clément Bœsch2012-06-04
| | | | | | | | | | | | | Some demuxers set a timecode in the format or streams metadata. The muxers now make use of this metadata instead of a duplicated private option. This makes possible transparent copy of the timecode when transmuxing and transcoding. -timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The global ffmpeg -timecode option will set it anyway so no option change visible for the user.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: librtmp: return AVERROR_UNKNOWN instead of -1. librtmp: don't abuse a variable for two unrelated things. librtmp: add rtmp_app and rtmp_playpath private options. bmv: add stricter checks for invalid decoded length avpacket: fix duplicating side data. flv: support stream text data as onTextData Conflicts: libavcodec/bmv.c libavformat/flvdec.c libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * librtmp: return AVERROR_UNKNOWN instead of -1.Anton Khirnov2012-06-03
| |
| * librtmp: don't abuse a variable for two unrelated things.Anton Khirnov2012-06-03
| |
| * librtmp: add rtmp_app and rtmp_playpath private options.Anton Khirnov2012-06-03
| | | | | | | | This makes it easier to switch between native rtmp and librtmp.
| * flv: support stream text data as onTextDataLuca Barbato2012-06-03
| | | | | | | | | | | | | | Adobe specifies onTextData as the standard message to use to deliver text information. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | set some categories of some AVClass structsMichael Niedermayer2012-06-03
| | | | | | | | | | | | Please help setting the category for all remaining AVClasses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Unconditionally compile init_stream() in bintext.Carl Eugen Hoyos2012-06-03
| | | | | | | | | | | | | | Fixes compilation of xbin, adf and idf demuxer if bintext demuxer was disabled. Fixes ticket #1399
* | mpegtsenc: zero pointers after freeingMichael Niedermayer2012-06-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts_audio_write: fix potential integer overflowMichael Niedermayer2012-06-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegtsenc: Support LATM packetization for AAC adtsenc: Don't expose the muxer internals to the rest of lavf mpegtsenc: use AVFormatContext for AAC packetization mpegtsenc: use AVERROR() for return codes Conflicts: libavformat/adts.h libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegtsenc: Support LATM packetization for AACJindrich Makovicka2012-06-03
| | | | | | | | | | | | | | | | | | This adds the avoption mpegts_flags and converts the existing resend_headers option into a flag, keeping the old option as fallback for now. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * adtsenc: Don't expose the muxer internals to the rest of lavfJindrich Makovicka2012-06-03
| | | | | | | | | | | | | | | | This isn't required any longer, when the mpegts muxer uses it as a proper chained muxer. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * mpegtsenc: use AVFormatContext for AAC packetizationJindrich Makovicka2012-06-03
| | | | | | | | | | | | | | | | This removes the dependency on adts.c internals, and simplifies adding other packetization formats. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * mpegtsenc: use AVERROR() for return codesJindrich Makovicka2012-06-03
| | | | | | | | | | Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggdec: fix regression that caused reading the whole file during openMichael Niedermayer2012-06-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: use input keyframe flag when muxer does not provide keyframe flags.Michael Niedermayer2012-06-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: http: Add the url_shutdown function for https, too http: Simplify code by removing a local variable http: Clear the old URLContext pointer when closed tcp: Try enabling SO_REUSEADDR when listening tcp: Check the return values from bind and accept avisynth: Make sure the filename passed to avisynth is in the right code page Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Add the url_shutdown function for https, tooMartin Storsjö2012-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Simplify code by removing a local variableMartin Storsjö2012-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Clear the old URLContext pointer when closedMartin Storsjö2012-06-01
| | | | | | | | | | | | | | This fixes issues with opening http urls that have authentication or redirects, introduced in commit e999b641. Signed-off-by: Martin Storsjö <martin@martin.st>
| * tcp: Try enabling SO_REUSEADDR when listeningMartin Storsjö2012-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * tcp: Check the return values from bind and acceptMartin Storsjö2012-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * avisynth: Make sure the filename passed to avisynth is in the right code pageOka Motofumi2012-05-31
| | | | | | | | | | | | | | | | avisynth is a non-unicode application and cannot accept UTF-8 characters. Therefore, the input filename should be converted to the correct code page that it expects. Signed-off-by: Martin Storsjö <martin@martin.st>
* | http: use ffurl_closep()Michael Niedermayer2012-06-01
| | | | | | | | | | | | Fixes Ticket1383 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | url: add ffurl_closep() which also sets the context pointer to NULLMichael Niedermayer2012-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: use av_freep() in ffurl_close()Michael Niedermayer2012-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tcp: Check the return values from bind and acceptMartin Storsjö2012-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | dv-demux: dont mess with codec valuesMichael Niedermayer2012-05-31
| | | | | | | | | | | | | | Fixes part of Ticket1369 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jacosub_probe: slightly increase the score to limit misdetection.Clément Bœsch2012-05-31
| |
* | jacosub_probe: speedup by making only one call to sscanfClément Bœsch2012-05-31
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines http: Pass the proper return code of net IO operations http: Add 'post_data', a new option which sets custom HTTP post data lavfi: amix: check active input count before calling request_samples vp8: move block coeff arithcoder on stack. mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3. Conflicts: libavformat/ac3dec.c libavformat/mp3dec.c tests/fate/ac3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Pass the proper return code of net IO operationsSamuel Pitoiset2012-05-30
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Add 'post_data', a new option which sets custom HTTP post dataSamuel Pitoiset2012-05-30
| | | | | | | | | | | | | | This allows doing http posts with a content-length header sent in advance, avoiding chunked encoding. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.Ronald S. Bultje2012-05-30
| |
* | oggparsevorbis: fix null ptr dereferenceMichael Niedermayer2012-05-31
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfenc: support 50 and 60 frame ratesMatthieu Bouron2012-05-31
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ipmovie_probe: speedup by avoiding memcmp() callMichael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3_probe: speedup by checking for header earlierMichael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | yop_probe: check more fields to avoid detecting random data as yopMichael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: fix odd extradata size case.Michael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat: ff_get_bmp_header: return esize tooMichael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'Michael Niedermayer2012-05-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725': fate: fix acodec/vsynth tests for make 3.81 pcm_mpeg: fix number of consumed bytes to include the header. avfilter: include required header file avfilter.h in video.h x86: Avoid movs on BUTTERFLYPS when in AVX mode x86: use new schema for ASM macros fate: convert codec-regression.sh to makefile rules fate: allow tests to specify unit size for psnr comparison fate: teach videogen/rotozoom to output a single raw video stream http: Add support for reusing the http socket for subsequent requests http: Add support for using persistent connections Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Add support for reusing the http socket for subsequent requestsSamuel Pitoiset2012-05-28
| | | | | | | | | | | | | | Introduce ff_http_do_new_request(), a new function which sends a new HTTP request, reusing the existing connection to the server. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Add support for using persistent connectionsSamuel Pitoiset2012-05-28
| | | | | | | | | | | | | | Add a new AVOption 'multiple_requests', which indicates if we want to use persistent connections (ie. Connection: keep-alive). Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/microdvd: support events lasting to the next one.Clément Bœsch2012-05-29
| | | | | | | | | | | | | | | | | | | | Example: {3350}{}this subtitle... {3390}{}...continues up to... {4000}{4500}this one. {4600}{}and now... {4800}{}...to the end of the presentation
* | ape: Fix null ptr dereference with files missing a seekatable.Michael Niedermayer2012-05-29
| | | | | | | | | | | | | | Such files are currently not supported as the table is used at several points Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movdec: Check count of stts/ctts elements instead of just the pointer.Michael Niedermayer2012-05-29
| | | | | | | | | | | | | | Fixes overreading the array Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 4xm: fix division by zero caused by bps<8Michael Niedermayer2012-05-29
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: Fix muxing of Apple Quicktime chapters. v3Philip Langdale2012-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is basic support for muxing chapter information into the Apple Quicktime format already, but there are two errors which prevent correct detection on the player side. 1) A special apple 'text' atom needs to be included inside the gmhd atom. 2) The *different* 'text' atom inside the 'stsd' atom needs a proper header. With these changes, the chapters are now picked up by Apple players and reported correctly by tools like mediainfo and mp4chaps. v3 Update: The stub TextSampleEntry creation is moved to where the chapter track is created so it's now specific to this track. Signed-off-by: Philip Langdale <philipl@overt.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 03:09:53 +0000