virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
11,890 Commits 39 Branches 425 Tags
83a0d3878c54b84b21c12be1981bd30096f278f4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Luca Abeni 83a0d3878c Split the RTP muxer out of rtp.c, to simplify the RTSP demuxer's dependencies 
Originally committed as revision 11408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 20:09:48 +00:00
Luca Abeni 8eb793c459 Split the RTP demuxing functions out of rtp.c, to simplify the RTP muxer's dependencies 
Originally committed as revision 11406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 19:33:50 +00:00
Luca Abeni 95c2184270 Rationalize some dependencies between rtsp and rtp 
Originally committed as revision 11385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-03 12:49:12 +00:00
Luca Abeni d80906e7b4 Fix the RTP muxer dependencies 
Originally committed as revision 11384 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-03 11:59:20 +00:00
Luca Abeni e8acf0edea Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(), 
and implement the redirector format more properly.

Originally committed as revision 11112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-29 08:35:05 +00:00
Luca Abeni 23c0634c78 Link libavdevice against libavutil, libavcodec, and libavformat 
(fix compilation for non-ELF targets).

Originally committed as revision 11085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-23 12:55:50 +00:00
Luca Abeni c4035e5d3f Fix the creation of alldevices.c (create it without any rename). 
This also requires some changes to configure

Originally committed as revision 11080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-23 08:07:23 +00:00
Luca Abeni c721d803cb Introduce libavdevice 
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-22 16:10:02 +00:00
Luca Abeni 087b327287 Include os_support.h only when needed 
Originally committed as revision 11073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 16:33:06 +00:00
Luca Abeni c5a2fe8f1f Generate a linking error if perror() is used in libav* 
Originally committed as revision 11061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-19 10:40:11 +00:00
Luca Abeni 952062909d Convert perror() in av_log() in bktr.c. 
Currently untested; someone with the correct OS and hardware should
test it and report if it works.

Originally committed as revision 11060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-19 10:33:05 +00:00
Luca Abeni 086119b3f3 Remove perror() usage from udp.c 
Originally committed as revision 11059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-19 08:07:33 +00:00
Luca Abeni 9f74582cea Do not use perror() in audio, video, and DV grabbers 
Originally committed as revision 11058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-19 07:54:04 +00:00
Luca Abeni 7f0cd6a529 Remove perror() usage from libavutil 
Originally committed as revision 11057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-19 07:39:55 +00:00
Luca Abeni db628029c4 Add MPEG2 support to the RTP muxer 
Originally committed as revision 11047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-16 13:13:53 +00:00
Luca Abeni 7ed19d7fbf Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP 
code (this is needed for supporting MPEG2 video in the RTP muxer)

Originally committed as revision 11046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-16 07:59:41 +00:00
Luca Abeni aa519c4771 Remove some more duplicated code 
Originally committed as revision 11038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-15 14:26:52 +00:00
Luca Abeni d4936869ff Remove the useless variable "my_addr1" 
Originally committed as revision 11037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-15 13:41:51 +00:00
Luca Abeni 882d00f27d Use the same code to set local_port in the IPv4-only case and in the 
protocol-independet case

Originally committed as revision 11036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-15 13:34:56 +00:00
Luca Abeni 6b7089044a Remove some useless assignments (the UDPContext is allocated with av_mallocz()) 
Originally committed as revision 11017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 08:22:06 +00:00
Luca Abeni d05cb726bd Simplify set_remote_url(), and remove some code duplication 
Originally committed as revision 11016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 08:16:51 +00:00
Luca Abeni 4c7d5764a0 Use recv() instead of recvfrom() (removes some other differences between 
IPv4-only and protocol-independent code)

Originally committed as revision 11015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 07:56:20 +00:00
Luca Abeni 66c49825da Remove a now unused field 
Originally committed as revision 11014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 07:45:15 +00:00
Luca Abeni 9cdcb04f5a Give better names to multicast functions (they are not IPv6-only) 
Originally committed as revision 11013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 07:43:51 +00:00
Luca Abeni a8bde059e6 Avoid to duplicate the multicast code between the IPv4-only and 
protocol-independent versions

Originally committed as revision 11012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 07:42:46 +00:00
Luca Abeni 0ec1233511 Remove some ifdefs by using the "dest_addr_len" field in both the IPv4-only 
code and the protocol-independent code

Originally committed as revision 11011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 07:35:36 +00:00
Luca Abeni c9215bab98 Add support for some more audio formats 
Originally committed as revision 10969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 12:33:28 +00:00
Luca Abeni 353fa898bb Reindent the code after last commit 
Originally committed as revision 10958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 11:59:39 +00:00
Luca Abeni cd250e581b Remove redundant "if(len)" 
Originally committed as revision 10957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 11:56:50 +00:00
Luca Abeni 18c05a375b Do not send too many RTCP packets (according to RFC 3550, the minimum 
RTCP interval should be 5 seconds)

Originally committed as revision 10930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-05 12:25:10 +00:00
Luca Abeni 0aa7a2e690 Use a symbolic name for the payload size of an RTCP Sender Report packet 
Originally committed as revision 10929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-05 10:15:20 +00:00
Luca Abeni 7d8576c279 Reindent after last commit 
Originally committed as revision 10882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-31 07:08:12 +00:00
Luca Abeni e76e2bbc09 Mark the source buffer as "const" 
Originally committed as revision 10877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 15:32:52 +00:00
Luca Abeni ecdcbbf66a If local port n is not available, try n + 2 instead of continuing to bind 
on n (allow to receive 2 rtsp streams simultaneously with libavformat)

Originally committed as revision 10876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 08:10:45 +00:00
Luca Abeni 990e989f24 Remove redundant prototype 
Originally committed as revision 10872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-29 09:38:37 +00:00
Luca Abeni c971ff1977 Remove the inclusion of rtsp.h and rtp.h from avformat.h, and 
explicitly include such headers where needed

Originally committed as revision 10871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-29 09:15:35 +00:00
Luca Abeni 759d98d0c6 Explicitly include rtp.h (needed for rtp_get_payload_type()) 
Originally committed as revision 10863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-26 15:12:55 +00:00
Luca Abeni a385446f40 Remove prototype for non-existent function 
Originally committed as revision 10862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-26 11:36:11 +00:00
Luca Abeni e0d21bfe83 Allow to set the maximum number of frames per RTP packet (and add support for 
this in the AAC packetizer)

Originally committed as revision 10647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-02 14:48:08 +00:00
Luca Abeni 20693c85b2 Add myself as a maintainer for the RTP muxer and for the SDP generator 
Originally committed as revision 10599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-27 06:38:03 +00:00
Luca Abeni 0ebecca52c Add my name to the copyright header, since rtp_mpv now contains 
a fair amount of code written by me

Originally committed as revision 10563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 12:15:42 +00:00
Luca Abeni d0c3be9568 Fix a warning by removing an useless assignment (buf_ptr should be only 
used in the RTP muxer, and not in the demuxer)

Originally committed as revision 10561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 10:43:26 +00:00
Luca Abeni 25e3e53d40 Fix an ffserver crash when a non-existing rtsp: url is requested 
Originally committed as revision 10519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-17 12:47:44 +00:00
Luca Abeni 9dc0bc3dad Use AVFMT_FLAG_GENPTS for the input file (the RTP output format needs all the 
PTSs to be set)

Originally committed as revision 10514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-17 07:50:04 +00:00
Luca Abeni 1a3a0a79b6 Support fragmentation for AAC frames 
Originally committed as revision 10492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-14 09:00:31 +00:00
Luca Abeni 171dce486c Support for AAC streaming over RTP. Fragmentation is not implemented yet 
Originally committed as revision 10491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-14 08:17:06 +00:00
Luca Abeni 21b3748029 Test extradata_size instead of the CODEC_FLAG_GLOBAL_HEADER flag to check if 
config info are available out of band (fix "-{a,v}codec copy" from .mov)

Originally committed as revision 10471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-10 15:08:23 +00:00
Luca Abeni af74c95a08 Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly) 
Originally committed as revision 10469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-10 07:01:29 +00:00
Luca Abeni 1b31b02ed1 Properly set RTP and NTP timestamps in RTCP SR packets 
Originally committed as revision 10468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-10 06:58:19 +00:00
Luca Abeni 4901263abd AAC support in the SDP generator 
Originally committed as revision 10398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 06:30:59 +00:00
Luca Abeni 5f2cbb53b4 Fill the buffer with 0 before writing an SDP in it 
Originally committed as revision 10287 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-03 09:00:40 +00:00
Luca Abeni 3f19004e46 Set the "B" flag in the payload header 
Originally committed as revision 10284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-03 07:28:58 +00:00
Luca Abeni 2d7d6d4203 Set the "TR" field in the payload header 
Originally committed as revision 10283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-03 07:22:37 +00:00
Luca Abeni 73130dfee2 Correctly set the "P" field in the payload header 
Originally committed as revision 10282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-03 07:14:10 +00:00
Luca Abeni 46b274d4e5 Correct packetization for MPEG video frames, and correct setting of the 
"B" and "E" bits in the payload header

Originally committed as revision 10260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-29 10:47:15 +00:00
Luca Abeni 7c8133aa44 Remove commented code (payload header extension) 
Originally committed as revision 10259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-29 10:42:13 +00:00
Luca Abeni 50755217f8 Use correct timescale in RTSP seeking 
Originally committed as revision 10222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-25 15:12:38 +00:00
Luca Abeni 7fa9d0dd8f Remove copyright from a function prototype 
Originally committed as revision 10214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-24 17:40:43 +00:00
Luca Abeni 24c07998b9 Reindent the code after the last commit 
Originally committed as revision 10203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-24 07:20:28 +00:00
Luca Abeni b2e6799bbb Remove RTSP special casing in ffplay startup 
Originally committed as revision 10202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-24 07:17:56 +00:00
Luca Abeni 98561024ac Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c) 
Originally committed as revision 10201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-24 07:13:34 +00:00
Luca Abeni e02f7490da Initialize the "stc" variable before using it in ff_find_start_code() 
Originally committed as revision 10193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-23 07:02:27 +00:00
Luca Abeni 6d1ba1ac83 Print an SDP when all outputs are RTP (the SDP can be saved in a text file 
and used to receive the streams)

Originally committed as revision 10150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-20 08:12:08 +00:00
Luca Abeni 89da5781a1 Call av_find_stream_info() immediately after opening an input file. 
Needed to avoid reading the same TS two times at the beginning of the
file (whic resulted in an "error, non monotone timestamps..." when
streaming RTP from a file)

Originally committed as revision 10148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-20 07:17:39 +00:00
Luca Abeni dd7234725d Use avf_sdp_create() in ffserver 
Originally committed as revision 10147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-20 07:07:20 +00:00
Luca Abeni 8767b80f5f Change avf_sdp_create() to get a pre-allocated buffer as input, and to 
return an integer (0 if the SDP has been succesfully created, < 0 in case
of error)

Originally committed as revision 9947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 13:44:56 +00:00
Luca Abeni 7ba32703dd Fix linking when RTP is disabled and libraries are dynamic 
Originally committed as revision 9945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 13:32:37 +00:00
Luca Abeni c5388c0784 Introduce an SDP generator 
Originally committed as revision 9806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-26 22:34:26 +00:00
Luca Abeni 1e7f363804 Implement av_strlcatf(): a strlcat which adds a printf style formatted string 
Originally committed as revision 9753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 06:36:02 +00:00
Luca Abeni aa89fa07b0 Remove unused file (this time for real) 
Originally committed as revision 23767 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-07-11 15:29:20 +00:00
Luca Abeni 0d79efeba9 Resurrect yuv2rgb_init.c, to add a proper license (and some comments about 
its origin) in it.

Originally committed as revision 23759 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-07-10 11:18:55 +00:00
Luca Abeni 653387d8f0 Support for the AVFMT_FLAG_NONBLOCK flag (non-blocking input) in v4l2.c 
Originally committed as revision 9496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 07:18:25 +00:00
Luca Abeni bf09c2e2a6 Add support for non-blocking input formats 
Originally committed as revision 9495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 07:16:47 +00:00
Luca Abeni 6969e0a030 Remove unused file 
Originally committed as revision 23715 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-07-03 13:52:36 +00:00
Luca Abeni df0cecdde0 Do not try to set a video standard unless "-tvstd" is specified 
Originally committed as revision 9088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-21 09:50:17 +00:00
Luca Abeni e4dd03f395 Reindent code after last commit 
Originally committed as revision 8973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 10:15:15 +00:00
Luca Abeni 578688fad5 Fix reading PTSs and DTSs in libavformat, by reverting r8465. 
Such commit introduced some regressions (see the "Possible bug in reading
PTS/DTS" and "[BUG] no video transcoding" threads on ffmpeg-devel).

Originally committed as revision 8826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-26 10:49:48 +00:00
Luca Abeni 57dbe08b61 Fix ffserver crash when closing the second RTP session 
Originally committed as revision 8799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-24 13:28:38 +00:00
Luca Abeni b0b2faa709 Fix an use-after-free bug 
Originally committed as revision 8759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-19 13:55:06 +00:00
Luca Abeni 2c6a5e6ccd Remove unused callbacks from ffserver 
Originally committed as revision 8758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-19 13:54:11 +00:00
Luca Abeni e8d658df34 Fix the poll() loop (ret == 0 means that a timeout expired, so it must be 
handled)

Originally committed as revision 8711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-10 14:40:03 +00:00
Luca Abeni 7e665cd3ff Fix the generation of RTSP reply headers (the "DEF()" macro is not used 
anymore in rtspcodes.h)

Originally committed as revision 8710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-10 14:36:11 +00:00
Luca Abeni 7a16861859 Do not jump to "fail" without having a proper sws context in img_resample_ctx 
(avoid calling sws_freeContext(NULL))

Originally committed as revision 8162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-28 15:07:35 +00:00
Luca Abeni 41536a6078 Pass the v4l2 buffer into the AVPacket, instead of allocating a new buffer 
and copying the frame into it (remove a memcpy())

Originally committed as revision 7981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-14 13:25:24 +00:00
Luca Abeni c7238c72cb Pass a proper context to av_log() 
Originally committed as revision 7946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-12 13:38:14 +00:00
Luca Abeni ab1c6dc95c Directly access av_log_level instead of calling av_log_{set, get}_level() 
(which will be removed at the next avutil version increment)

Originally committed as revision 7882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-08 18:55:36 +00:00
Luca Abeni 2d529db50f Pass a context to av_log(), when possible 
Originally committed as revision 21999 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-01-23 13:41:45 +00:00
Luca Abeni 434f2c18e8 Increase the av_log() levels, and add some documentation for them 
Originally committed as revision 7614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 20:47:10 +00:00
Luca Abeni d28ef27031 deprecate sws_scale_ordered(), as it now is a duplicate of sws_scale() 
Originally committed as revision 21888 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-01-12 15:45:47 +00:00
Luca Abeni 703b56fb5d Add "support for both orderings of the slices (top->down / bottom->up)" 
(r15249) to sws_scale() too (until now, it only was in sws_scale_ordered())

Originally committed as revision 21887 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-01-12 15:40:08 +00:00
Luca Abeni 40628be0ed __attribute__((unused)) works with gcc 2.95 too 
Originally committed as revision 7421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-07 11:11:49 +00:00
Luca Abeni 0dea6433fd replace some av_malloc();memset(...,0,...) sequences with av_mallocz() 
Originally committed as revision 21835 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2007-01-06 12:11:25 +00:00
Luca Abeni b2afecbe02 change all the occurrences of "FFMIN(FFMAX())" to clip_uint8() or clip() 
Originally committed as revision 21776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-26 18:08:40 +00:00
Luca Abeni 789237cad0 Mark some variables as possibly unused to avoid warnings 
Originally committed as revision 21775 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-26 17:59:28 +00:00
Luca Abeni 628bc5e862 Add some explicit casts to avoid "assignment from incompatible pointer type" 
warnings

Originally committed as revision 21774 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-26 17:41:38 +00:00
Luca Abeni 44060a7391 Add some other casts, to remove void pointers arithmetic 
Originally committed as revision 21773 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-26 16:28:34 +00:00
Luca Abeni 7d19628b14 Add some explicit casts to avoid some warnings 
Originally committed as revision 21772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-26 16:21:13 +00:00
Luca Abeni 9effd94abc Remove some void pointers arithmetic 
Originally committed as revision 21771 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-26 16:12:37 +00:00
Luca Abeni d32d303568 Clarify that yuv2rgb_init.c cannot be used under LGPL 
Originally committed as revision 21730 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2006-12-22 17:57:19 +00:00
Luca Abeni 11c6f4a11c Opss... My last commit was wrong; sorry! 
This one moves the GPL check in the right place

Originally committed as revision 7359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-22 15:05:30 +00:00