summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/mdec: make block_index static constMichael Niedermayer2013-08-021-1/+1
|
* avcodec/mjpeg: make 2 outcommented tables staticMichael Niedermayer2013-08-021-2/+2
|
* avcodec/dxtory: make def_lru[8] staticMichael Niedermayer2013-08-021-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/dnxhdenc: make header_prefix static constMichael Niedermayer2013-08-021-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/matroskaenc: make 2 tables static that are not used outside matroskaencMichael Niedermayer2013-08-021-2/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* movenc: make uuids static constMichael Niedermayer2013-08-021-3/+3
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* ttaenc: fix packet sizePaul B Mahol2013-08-021-1/+1
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avdevice/timefilter-test: dont try to optimize par1 for n0=0 caseMichael Niedermayer2013-08-022-2/+3
| | | | | | | | for the n0=0 case there are multiple solutions and different platforms pick different ones This should reduce the issues with fate and the timefilter test Signed-off-by: Michael Niedermayer <[email protected]>
* flvdec: silence unused warningMichael Niedermayer2013-08-021-1/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-021-67/+87
|\ | | | | | | | | | | | | | | | | | | * qatar/master: h264_sei: K&R formatting cosmetics Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <[email protected]>
| * h264_sei: K&R formatting cosmeticsVittorio Giovara2013-08-011-58/+78
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'Michael Niedermayer2013-08-022-95/+96
|\| | | | | | | | | | | | | | | * commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c': h264_sei: Remove pointless old comment twinvq: Add proper twinvq prefixes to identifiers Merged-by: Michael Niedermayer <[email protected]>
| * h264_sei: Remove pointless old commentDiego Biurrun2013-08-011-1/+1
| |
| * twinvq: Add proper twinvq prefixes to identifiersDiego Biurrun2013-08-011-94/+95
| |
* | Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'Michael Niedermayer2013-08-021-11/+7
|\| | | | | | | | | | | | | * commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5': flvdec: Eliminate completely silly goto Merged-by: Michael Niedermayer <[email protected]>
| * flvdec: Eliminate completely silly gotoDiego Biurrun2013-08-011-11/+7
| |
* | Merge commit 'e4529df944616917ae8462f5102253ff7f983093'Michael Niedermayer2013-08-021-339/+410
|\| | | | | | | | | | | | | | | | | | | * commit 'e4529df944616917ae8462f5102253ff7f983093': flvdec: K&R formatting cosmetics Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <[email protected]>
| * flvdec: K&R formatting cosmeticsDiego Biurrun2013-08-011-323/+386
| |
* | Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'Michael Niedermayer2013-08-021-1/+1
|\| | | | | | | | | | | | | * commit '390b4d7088b5cecace245fee0c54a57e24dabdf4': flvdec: Fix = vs. == typo in sample rate check Merged-by: Michael Niedermayer <[email protected]>
| * flvdec: Fix = vs. == typo in sample rate checkDiego Biurrun2013-08-011-1/+1
| |
* | Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'Michael Niedermayer2013-08-021-8/+5
|\| | | | | | | | | | | | | * commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423': rtsp: Simplify code for forming the remote peer url Merged-by: Michael Niedermayer <[email protected]>
| * rtsp: Simplify code for forming the remote peer urlMartin Storsjö2013-08-011-8/+5
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | jpeg2000dec: simplify jpeg2000_read_bitstream_packets()Michael Niedermayer2013-08-021-43/+20
| | | | | | | | | | | | | | 23 lines less less error prone as theres no more need to update *_size on every read Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/wmaenc: change commented assert to av_assertMichael Niedermayer2013-08-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | mpegts: save last pcr of pcr pids in PES ContextMarton Balint2013-08-021-3/+17
| | | | | | | | | | | | | | | | Based on a patch by Reimar Döffinger. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html Signed-off-by: Marton Balint <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | libxvid: cosmetics: Realign the codeTimothy Gu2013-08-021-34/+33
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: raise level for message printed in case of auto-select pixel formatStefano Sabatini2013-08-011-1/+1
| | | | | | | | | | | | | | Increase visibility, in order to decrease troubleshooting for users generating non playable H.264 content. Signed-off-by: Carl Eugen Hoyos <[email protected]>
* | lavf/movenc: Write disc number and total number of discs as part of metadata.Carl Eugen Hoyos2013-08-011-7/+10
| | | | | | | | Fixes ticket #2731.
* | lavf/movenc: Write total number of tracks as part of metadata.Carl Eugen Hoyos2013-08-011-1/+5
| | | | | | | | Fixes ticket #2157.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-012-2/+2
|\| | | | | | | | | | | | | * qatar/master: avframe: have av_frame_get_side_data take const AVFrame* Merged-by: Michael Niedermayer <[email protected]>
| * avframe: have av_frame_get_side_data take const AVFrame*Vittorio Giovara2013-08-012-2/+2
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'Michael Niedermayer2013-08-011-2/+11
|\| | | | | | | | | | | | | * commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2': rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url Merged-by: Michael Niedermayer <[email protected]>
| * rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_urlMartin Storsjö2013-08-011-2/+11
| | | | | | | | | | | | | | | | | | | | A separate rtcp port can already be set when opening the rtp protocol normally, but when doing port setup as in RTSP (where we first need to open the local ports and pass them to the peer, and only then receive the remote peer port numbers), we didn't check the same url parameter as in the normal open routine. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'Michael Niedermayer2013-08-011-0/+3
|\| | | | | | | | | | | | | * commit '1851e1d05d06f6ef3436c667e4354da0f407b226': rtpproto: Check the size before reading buf[1] Merged-by: Michael Niedermayer <[email protected]>
| * rtpproto: Check the size before reading buf[1]Martin Storsjö2013-08-011-0/+3
| | | | | | | | | | | | | | | | I doubt that anyone ever would try to send a 1 byte packet via the RTP protocol, but check just in case - it shouldn't crash at least. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'Michael Niedermayer2013-08-011-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7748dd41be3d6dd6300f14263586af4ee104ead2': avconv: add -n option to immediately exit when output files already exist Conflicts: Changelog doc/ffmpeg.texi ffmpeg_opt.c See: 0a4f02117b67c135a27e3490aea1631ad9f4312f Merged-by: Michael Niedermayer <[email protected]>
| * avconv: add -n option to immediately exit when output files already existVittorio Giovara2013-07-313-1/+13
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b'Michael Niedermayer2013-08-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b': avconv: Call exit_program instead of exit in avconv_opt as well Conflicts: ffmpeg_opt.c See: eeddeb6579d8133871dc15f989ab8ffec5b5b396 Merged-by: Michael Niedermayer <[email protected]>
| * avconv: Call exit_program instead of exit in avconv_opt as wellMartin Storsjö2013-07-311-70/+70
| | | | | | | | | | | | This seems to have been missed in 636ced8e1dc. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'Michael Niedermayer2013-08-011-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b': avopt: Check whether the object actually has got an AVClass Conflicts: libavutil/opt.c Merged-by: Michael Niedermayer <[email protected]>
| * avopt: Check whether the object actually has got an AVClassMartin Storsjö2013-07-311-0/+3
| | | | | | | | | | | | | | | | | | | | AVIOContext has got an av_class member that only gets set if opening the context using avio_open2, but not if allocating a custom IO context. A caller that wants to read AVOptions from an AVIOContext (recursively using AV_OPT_SEARCH_CHILDREN) may not know if the AVIOContext actually has got a class set or not. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'Michael Niedermayer2013-08-016-5/+36
|\| | | | | | | | | | | | | * commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5': rtpproto: Move rtpproto specific function declarations to a separate header Merged-by: Michael Niedermayer <[email protected]>
| * rtpproto: Move rtpproto specific function declarations to a separate headerMartin Storsjö2013-07-316-5/+36
| | | | | | | | | | | | | | Mixing these with the rtp depacketizer functions in rtpdec.h is no good. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'Michael Niedermayer2013-08-011-19/+6
|\| | | | | | | | | | | | | * commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec': rtpproto: Simplify the rtp_read function by looping over the fds Merged-by: Michael Niedermayer <[email protected]>
| * rtpproto: Simplify the rtp_read function by looping over the fdsMartin Storsjö2013-07-311-19/+6
| | | | | | | | | | | | | | This avoids having duplicate code where only the fd parameter differs. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'Michael Niedermayer2013-08-011-1/+0
|\| | | | | | | | | | | | | * commit '7531588fffbca1f0afdcc06635999c00dfc16ca6': rtpproto: Remove a misplaced comment Merged-by: Michael Niedermayer <[email protected]>
| * rtpproto: Remove a misplaced commentMartin Storsjö2013-07-311-1/+0
| | | | | | | | | | | | | | The fdset is a pollfd array nowadays, and it is already populated at this point. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'Michael Niedermayer2013-08-011-1/+4
|\| | | | | | | | | | | | | * commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e': rtpproto: Support nonblocking reads Merged-by: Michael Niedermayer <[email protected]>
| * rtpproto: Support nonblocking readsMartin Storsjö2013-07-311-1/+4
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '2e814d0329aded98c811d0502839618f08642685'Michael Niedermayer2013-08-012-2/+4
|\| | | | | | | | | | | | | * commit '2e814d0329aded98c811d0502839618f08642685': rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps Merged-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 08:13:14 +0000