Commit graph

51 commits

Author SHA1 Message Date
Karl Blomster
3dc40e5c34 Missed two renamings in the last commit.
Originally committed to SVN as r3109.
2009-07-13 02:48:07 +00:00
Karl Blomster
80a8ea634b Hack in some compatibility #defines in FFMS2's utils.h so it'll compile with both older and newer ffmpeg versions. Reverts r3012. Part of this change based on a patch by CharlieB. Fixes #909.
Originally committed to SVN as r3108.
2009-07-13 02:34:41 +00:00
Karl Blomster
db2ba854dc - Moved lib/ffms2.lib to FFmpegSource2/ffms2.lib.
- Deleted the lib folder since nothing uses it anymore.
- Modifed the #include of ffms.h in ffmpegsource_common.h to make it easier to use an external ffms2 instead of the one in the repository.
- Updated vs2008 project file to reflect these changes.
- Easily claims build breaker's hat.

Originally committed to SVN as r3052.
2009-06-12 17:10:45 +00:00
Amar Takhar
222f075778 Revert part of r3005, rename AV_PKT_FLAG_KEY back to PKT_FLAG_KEY, ffmpeg has added a compat define for any programs still using the old define. This is a temporary measure until we figure out how to properly handle it.
Originally committed to SVN as r3012.
2009-06-04 00:17:14 +00:00
Fredrik Mellbin
ec297a5f11 FFMS2:
Flag keyframes in generated packets more properly
Requires FFmpeg r19078 to compile because of the changed define names

Originally committed to SVN as r3005.
2009-06-03 14:35:21 +00:00
Fredrik Mellbin
72bb9214fb FFMS2: Improve LAVF audio seeking in weird files
Originally committed to SVN as r2994.
2009-05-29 16:35:10 +00:00
Fredrik Mellbin
974bad3b6e FFMS2: beta 9 TAG!
Originally committed to SVN as r2993.
2009-05-28 20:26:18 +00:00
Fredrik Mellbin
38c420c7bd FFMS2:
Renamed a public api function just because I can
Less access violations (AGAIN!)
Dumping now implies indexing too
Much better logic for automatically indexing files when FFAudioSource is used in avisynth
Changed defaults for FFIndex
Now FFmpeg's internal codec lists are used for lookup from the non-lavf based parts

Originally committed to SVN as r2991.
2009-05-28 19:33:14 +00:00
Karl Blomster
4ba221a931 Another missing ifdef in ffmsindex
Originally committed to SVN as r2988.
2009-05-25 16:28:28 +00:00
Fredrik Mellbin
64242fd363 FFMS2: unix ifdefs in ffmsindex
Originally committed to SVN as r2987.
2009-05-25 16:25:43 +00:00
Karl Blomster
3a947259f7 Update FFMSIndex to work with the new audio dump method.
Also update ffms2.lib (again).

Originally committed to SVN as r2985.
2009-05-25 15:50:31 +00:00
Fredrik Mellbin
5857345b8d FFMS2: revert the initialization mess, instead require the caller to initialize com where it's needed
Originally committed to SVN as r2984.
2009-05-25 14:05:04 +00:00
Fredrik Mellbin
12482ac418 FFMS2: more initialization fun
Originally committed to SVN as r2981.
2009-05-24 23:04:11 +00:00
Fredrik Mellbin
45dc8d8819 FFMS2: The usual small fixes
Originally committed to SVN as r2979.
2009-05-23 20:04:38 +00:00
Fredrik Mellbin
da8163055c FFMS2:
Simplify the avisynth filters
Small api change => you can now list a group of desired colorspace output formats for automatic selection, less functions can return errors
Less singnedness warnings

Originally committed to SVN as r2978.
2009-05-23 14:18:51 +00:00
Fredrik Mellbin
3a7618cd64 FFMS2: Use the average fps for files opened with Haali's splitters
Originally committed to SVN as r2977.
2009-05-22 23:41:37 +00:00
Fredrik Mellbin
cb1a9ba0b3 FFMS2:
Fix the weird crash bug
Fix *nix compilation

Originally committed to SVN as r2976.
2009-05-22 23:28:08 +00:00
Fredrik Mellbin
24c0a673b9 FFMS2: Missing #ifdef
Originally committed to SVN as r2975.
2009-05-22 22:12:31 +00:00
Fredrik Mellbin
d2c469e3e0 FFMS2:
Added audio decoding using Haali's splitters
Restructuring
Big API changes
Many bug fixes

Originally committed to SVN as r2972.
2009-05-22 21:28:02 +00:00
Fredrik Mellbin
73dbcf6ecd FFMS2: More ICL warning inspired fixes
Originally committed to SVN as r2960.
2009-05-21 10:39:14 +00:00
Fredrik Mellbin
7b0efd10f8 FFMS2: ICL compilation fix
Originally committed to SVN as r2959.
2009-05-21 10:05:53 +00:00
Fredrik Mellbin
3d2ad9525a FFMS2: Another small typo after all the changes
Originally committed to SVN as r2957.
2009-05-20 22:40:55 +00:00
Fredrik Mellbin
9d636c3cfb FFMS2: Missing #ifdef
Originally committed to SVN as r2956.
2009-05-20 19:05:42 +00:00
Fredrik Mellbin
cd7932d6ee FFMS2:
Split indexing into a 2 step process so track numbers/types become known in advance
Big code cleanup and renaming

Originally committed to SVN as r2955.
2009-05-20 18:57:03 +00:00
Fredrik Mellbin
fdf73126b9 FFMS2:
Some more API cleanup
General cleanup

Originally committed to SVN as r2947.
2009-05-17 22:02:43 +00:00
Amar Takhar
e5eb667879 As required by r2940 supply -DFFMS_EXPORTS when building the library.
Originally committed to SVN as r2941.
2009-05-16 12:13:27 +00:00
Fredrik Mellbin
80a209e95a FFMS2:
Rename lots of things, THIS BREAKS THE AEGISUB BUILD because of changed exported type and function names.
Fixed an uninitialized memory bug that would make it crash on unindexed audio tracks in mastroska.
Made ffms.h C-friendlier.
Exports the start time of an audio track in the audio properties.
Less signedness and type conversion warnings.

Originally committed to SVN as r2940.
2009-05-15 23:11:18 +00:00
Fredrik Mellbin
16f3f59cb2 FFMS2: api change so the logging level can be set arbitrarily, it also defaults to quiet now
Originally committed to SVN as r2918.
2009-05-12 20:50:40 +00:00
Fredrik Mellbin
2cab187fd8 FFMS2: beta 8
Originally committed to SVN as r2907.
2009-05-09 21:59:24 +00:00
Karl Blomster
02f7d0006c change how ffmsindex is linked to ffms2 (use a #pragma instead of an extra dependency in the project file)
Originally committed to SVN as r2902.
2009-05-05 21:43:49 +00:00
Fredrik Mellbin
0a221706d5 FFMS2:
Fix an old bug that would drop the first or second video frame
Greatly improved audio decoding by adding a small internal cache

Originally committed to SVN as r2894.
2009-05-03 19:25:54 +00:00
Fredrik Mellbin
487dc50409 FFMS2: Add a missing function the updated matroska parser expects
Originally committed to SVN as r2890.
2009-05-01 16:58:15 +00:00
Karl Blomster
4445d812ce Re-update the license on Haali's matroska parser.
Originally committed to SVN as r2887.
2009-04-29 21:19:45 +00:00
Fredrik Mellbin
fad9a58240 FFMS2: Update Haali's matroska parser
Originally committed to SVN as r2885.
2009-04-29 21:06:07 +00:00
Fredrik Mellbin
27e90e973f FFMS2: Beta 7 release
Fix 3 gcc warnings

Originally committed to SVN as r2879.
2009-04-29 16:39:15 +00:00
Fredrik Mellbin
bc46304aa1 FFMS2: Another much needed set of fixes to the Haali part
Originally committed to SVN as r2853.
2009-04-25 22:09:49 +00:00
Fredrik Mellbin
3655fbb7fa Fix the video provider after the FFMS2 changes part2
Originally committed to SVN as r2852.
2009-04-25 10:31:39 +00:00
Fredrik Mellbin
61d14a7b89 FFMS2: Even less enum forward declarations
Originally committed to SVN as r2850.
2009-04-25 09:09:14 +00:00
Fredrik Mellbin
4e7bff9bd6 FFMS2: Less enum forward declaration?
Originally committed to SVN as r2849.
2009-04-25 08:55:14 +00:00
Fredrik Mellbin
4b74827df6 FFMS2:
Remove the dependency of pixfmt.h in ffms.h
Added the alternative FFMS_GetPixFmt() for getting the different pixel format values

Originally committed to SVN as r2845.
2009-04-24 19:56:19 +00:00
Fredrik Mellbin
b8cf6fce8e FFMS2:
Several bugfixes which should fix crashes in recent versions
Added a simple regression test application
Removed a few useless functions from the API
Add TheFluff's FFmpegSource 1.21 syntax compatibility script

Originally committed to SVN as r2843.
2009-04-24 17:42:21 +00:00
Fredrik Mellbin
bd0f1dcd10 FFMS2: Various fixes to haali stuff
Originally committed to SVN as r2837.
2009-04-22 18:38:28 +00:00
Karl Blomster
0ad0b6d5c9 Fix a bug in FFMS2 that caused it to write timecodes with scientific notation.
Originally committed to SVN as r2808.
2009-04-17 03:25:10 +00:00
Fredrik Mellbin
6ca864b88c FFMS2 GCC compilation fix
Originally committed to SVN as r2781.
2009-04-11 19:43:18 +00:00
Fredrik Mellbin
cae545b1eb FFMS2 beta 6 (the real commit)
Requires a recent FFmpeg
Changes the HAALITS define into HAALISOURCE

Originally committed to SVN as r2780.
2009-04-11 18:45:40 +00:00
Karl Blomster
ff1a4fb8fc Add a -v option to ffmsindex.
Originally committed to SVN as r2775.
2009-04-07 01:12:12 +00:00
Karl Blomster
ac2c8bbed6 FFMS2 compile fix for ffmpeg revisions >18129. Probably breaks backwards compatibility so it doesn't compile with older revisions anymore, have fun.
Originally committed to SVN as r2772.
2009-04-06 20:15:49 +00:00
Karl Blomster
6bb861c7ef FFmpegSource2 beta 6, see ffms2.html for change details
Originally committed to SVN as r2770.
2009-04-06 19:14:55 +00:00
Karl Blomster
89c465dc71 FFmpegSource2 beta 5.
Fixes a bug with timecode writing, adds some additional documentation and resolves the issue with reading ffmsindex's progress reporting from another program.

Originally committed to SVN as r2768.
2009-03-30 22:09:33 +00:00
Amar Takhar
d7e023e57f Update the build system for the new repository layout.
Originally committed to SVN as r2757.
2009-03-09 00:58:38 +00:00