summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'Michael Niedermayer2013-11-301-5/+5
|\ | | | | | | | | | | | | * commit 'f058f384a0d76bfd125f4738dceab7c890186432': configure: Do not use pthread_create to check for pthread Merged-by: Michael Niedermayer <[email protected]>
| * configure: Do not use pthread_create to check for pthreadLuca Barbato2013-11-301-5/+5
| | | | | | | | | | | | | | Certain instrumentation addons leads to a false positive in configure and link failures at the end of the build phase. Signed-off-by: Luca Barbato <[email protected]>
* | avcodec/mpeg4video: fix doxycomments so they are not associated with random ↵Michael Niedermayer2013-11-301-5/+5
| | | | | | | | | | | | unrelated fields Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-11-301-20/+28
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: lavc/srtenc: use bprint for text buffers. Merged-by: Michael Niedermayer <[email protected]>
| * | lavc/srtenc: use bprint for text buffers.Nicolas George2013-11-301-20/+28
| | | | | | | | | | | | Fix trac ticket #3120.
* | | version.sh: make it independant of version.h file nameTimothy Gu2013-11-301-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Timothy Gu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | | doc/ffserver: clarify documentation for Feed MaxFileSize optionStefano Sabatini2013-11-301-2/+3
| | |
* | | doc/ffserver: clarify that note in NoDaemon option documentationStefano Sabatini2013-11-301-2/+2
| | |
* | | ffserver: print error code description in case of write_header() failureStefano Sabatini2013-11-301-1/+1
| | | | | | | | | | | | Improve feedback.
* | | doc/ffserver: add "Detailed description" chapterStefano Sabatini2013-11-301-13/+108
| | | | | | | | | | | | Also move FFM section up in the file, and rename it.
* | | doc/ffserver: remove more mentions to LAME and buildStefano Sabatini2013-11-301-7/+0
|/ /
* | lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not neededJames Almer2013-11-301-2/+0
| | | | | | | | | | | | | | | | | | | | They are only needed by removelogo. This fixes a link failure in shared builds when compiling with removelogo disabled but Lavf/SwS enabled Signed-off-by: James Almer <[email protected]> Reviewed-by: Stefano Sabatini <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-11-301-6/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration ffmpeg: free empty subtitles as well in transcode_subtitles ffmpeg: do not pass possibly undefined subtitles to sub2video_update Merged-by: Michael Niedermayer <[email protected]>
| * | ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero durationMarton Balint2013-11-281-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fix_sub_duration is used, and the duration fixing code is generating 0 duration, that is definitely zero, and not undefined or infinite (which may be the case for decoded AVSubtitles depending on the codec), so it is safe to drop it. It fixes teletext subtitle sources, when the subtitles are transmitted twice after each other for some reason. Signed-off-by: Marton Balint <[email protected]> Reviewed-by: Nicolas George <[email protected]>
| * | ffmpeg: free empty subtitles as well in transcode_subtitlesMarton Balint2013-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even if it does not matter at the moment, because subtitles with num_rect == 0 have no memory allocated, this is how we expect the users to use the API, a returned AVSubtitle should be freed with avsubtitle_free. Signed-off-by: Marton Balint <[email protected]> Reviewed-by: Nicolas George <[email protected]>
| * | ffmpeg: do not pass possibly undefined subtitles to sub2video_updateMarton Balint2013-11-281-1/+4
| | | | | | | | | | | | | | | | | | | | | It should not matter for real-life usage, it is just cleaner this way. Signed-off-by: Marton Balint <[email protected]> Reviewed-by: Nicolas George <[email protected]>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-301-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * qatar/master: go2meeting: disallow tile dimensions that are not multiple of 16 Merged-by: Michael Niedermayer <[email protected]>
| * | go2meeting: disallow tile dimensions that are not multiple of 16Kostya Shishkov2013-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | Original decoder seems to always use 176x128 tiles anyway and this helps avoiding lots of issues with odd tile sizes in fuzzed files. Signed-off-by: Anton Khirnov <[email protected]>
* | | Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer2013-11-304-27/+29
|\| | | | | | | | | | | | | | | | | | | | * commit 'e026ee0446de27fc38e33e98704fada012fdc763': mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-294-27/+29
| | |
* | | Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer2013-11-304-11/+12
|\| | | | | | | | | | | | | | | | | | | | * commit '513d849bb605d3d862da1ada709bd2ca1ac68f58': mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move num_sprite_warping_points from MpegEncContext to ↵Anton Khirnov2013-11-294-11/+12
| | | | | | | | | | | | Mpeg4DecContext
* | | Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer2013-11-303-3/+3
|\| | | | | | | | | | | | | | | | | | | | * commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091': mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move sprite_brightness_change from MpegEncContext to ↵Anton Khirnov2013-11-293-3/+3
| | | | | | | | | | | | Mpeg4DecContext
* | | Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer2013-11-303-6/+6
|\| | | | | | | | | | | | | | | | | | | | * commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-293-5/+5
| | |
* | | Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer2013-11-303-3/+3
|\| | | | | | | | | | | | | | | | | | | | * commit '6e81597d5a89f64dfab5c7e99e46b4355139e324': mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-293-3/+3
| | |
* | | Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'Michael Niedermayer2013-11-302-2/+1
|\| | | | | | | | | | | | | | | | | | | | * commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-292-2/+1
| | |
* | | Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer2013-11-303-6/+7
|\| | | | | | | | | | | | | | | | | | | | * commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab': mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-293-4/+5
| | |
* | | Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'Michael Niedermayer2013-11-302-4/+1
|\| | | | | | | | | | | | | | | | | | | | * commit 'e89247debd5276d57ce4a26516224204f9541af0': mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variableAnton Khirnov2013-11-292-4/+1
| | |
* | | Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'Michael Niedermayer2013-11-302-2/+1
|\| | | | | | | | | | | | | | | | | | | | * commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-292-2/+1
| | |
* | | Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer2013-11-303-10/+11
|\| | | | | | | | | | | | | | | | | | | | * commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809': mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-293-10/+11
| | |
* | | mpeg4_update_thread_context: copy the whole mpeg4 specific context instead ↵Michael Niedermayer2013-11-301-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | of variables one by one This simplifies the code Signed-off-by: Michael Niedermayer <[email protected]>
* | | Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer2013-11-303-33/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '038890740014dc33d2e2f04da7cf0a9da821264e': mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to ↵Anton Khirnov2013-11-293-33/+34
| | | | | | | | | | | | Mpeg4DecContext
* | | avcodec/mpeg4videodec: update bug workaround related variables like they ↵Michael Niedermayer2013-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | where before This fixes the code after the variables have been moved into the mpeg4 decoder. Signed-off-by: Michael Niedermayer <[email protected]>
* | | Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'Michael Niedermayer2013-11-303-59/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43af264de8606668c6b2fa7f96c946bdc3dbe072': mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move mpeg4-specific bug workaround variables from ↵Anton Khirnov2013-11-293-60/+62
| | | | | | | | | | | | MpegEncContext to Mpeg4DecContext
* | | Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer2013-11-303-31/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb': mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec Conflicts: libavcodec/h263dec.c libavcodec/mpeg4video.h libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to ↵Anton Khirnov2013-11-293-33/+46
| | | | | | | | | | | | mpeg4videodec
* | | avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id checkMichael Niedermayer2013-11-301-2/+4
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | | Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'Michael Niedermayer2013-11-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b452d5ae866942cec00aa1432fe29498b38b49fc': mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4 Conflicts: libavcodec/h263dec.c not merged, the header decode function is not the right place See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f Merged-by: Michael Niedermayer <[email protected]>
| * | mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4Anton Khirnov2013-11-292-85/+86
| | |
* | | avcodec/mpeg4videodec: move bug workaround code into seperate functionMichael Niedermayer2013-11-303-104/+115
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 10:19:27 +0000