Statistics
| Branch: | Revision:

ffmpeg / ffmpeg.c @ 0a5790d1

History | View | Annotate | Download (135 KB)

# Date Author Comment
1af2ca78 08/10/2007 07:28 AM Stefano Sabatini

Prefix with "opt_" the functions ffmpeg.c:show_{version,license,formats}.
patch by Stefano Sabatini [stefano tod sabatini-lala £ poste it]

Originally committed as revision 10049 to svn://svn.ffmpeg.org/ffmpeg/trunk

de2aeaef 08/10/2007 01:15 AM Michael Niedermayer

fix x11grab

Originally committed as revision 10046 to svn://svn.ffmpeg.org/ffmpeg/trunk

aab1b7e5 08/09/2007 12:13 PM Stefano Sabatini

Make ffmpeg and ffplay exit 0 after displaying help
patch by Stefano Sabatini [stefano sabatini minus lala at poste it]

Originally committed as revision 10012 to svn://svn.ffmpeg.org/ffmpeg/trunk

81d6d520 08/08/2007 06:54 PM Michael Niedermayer

always handle negative timestamp differences as timestamp discontinuity

Originally committed as revision 9984 to svn://svn.ffmpeg.org/ffmpeg/trunk

4a897224 08/08/2007 02:34 PM Nicolas George

Use the codec name from the command line options instead of the codec id.
patch by Nicolas George [nicolas dot george normalesup org]
original thread: [FFmpeg-devel] [PATCH] Codec lookup: do not use codec_id
date: 06/18/2007 06:19 PM

Originally committed as revision 9983 to svn://svn.ffmpeg.org/ffmpeg/trunk

9895ebe4 08/07/2007 02:09 PM Benoit Fouet

Avoid showing banner twice.

Originally committed as revision 9980 to svn://svn.ffmpeg.org/ffmpeg/trunk

a9bb28a3 08/07/2007 12:46 AM Ramiro Polla

Indent

Originally committed as revision 9971 to svn://svn.ffmpeg.org/ffmpeg/trunk

a8482aab 08/07/2007 12:26 AM Michael Niedermayer

make dts_delta_threshold float so values <1 can be used

Originally committed as revision 9970 to svn://svn.ffmpeg.org/ffmpeg/trunk

d4d226a8 08/07/2007 12:03 AM Michael Niedermayer

audio drift threshold
(this switches between resampling style timestamp drift compensation and
hard insert silence / drop samples compensation)

Originally committed as revision 9969 to svn://svn.ffmpeg.org/ffmpeg/trunk

365515ac 08/04/2007 04:03 PM Michael Niedermayer

be slightly more careful with copying the codec_tag in the streamcopy case
fixes streamcopy of Xmen-avc-500.vp6 into flv
closes issue 57

Originally committed as revision 9909 to svn://svn.ffmpeg.org/ffmpeg/trunk

7cacf1e8 08/03/2007 11:25 PM Michael Niedermayer

drop non keyframes before the first keyframe for stream copy

Originally committed as revision 9881 to svn://svn.ffmpeg.org/ffmpeg/trunk

4efd6f58 08/03/2007 11:23 PM Michael Niedermayer

fix block_align for mp3 stream copy

Originally committed as revision 9880 to svn://svn.ffmpeg.org/ffmpeg/trunk

c0dd7b7c 08/03/2007 08:49 PM Michael Niedermayer

get rid of some double timebase convertion

Originally committed as revision 9878 to svn://svn.ffmpeg.org/ffmpeg/trunk

fec401f7 08/03/2007 07:21 PM Michael Niedermayer

properly implement "user specified start time offset" which was added in r3217
-ss should now work again
fixes decoding of low.ogg
closes issue47

Originally committed as revision 9876 to svn://svn.ffmpeg.org/ffmpeg/trunk

11bf3847 07/25/2007 07:47 PM Aurelien Jacobs

add proper support for subtitles muxing/stream copying

Originally committed as revision 9798 to svn://svn.ffmpeg.org/ffmpeg/trunk

8e0d882b 07/25/2007 07:39 PM Aurelien Jacobs

copy language information from input stream to output

Originally committed as revision 9797 to svn://svn.ffmpeg.org/ffmpeg/trunk

a03d59b7 07/25/2007 07:36 PM Aurelien Jacobs

copy packet duration when doing a stream copy

Originally committed as revision 9796 to svn://svn.ffmpeg.org/ffmpeg/trunk

390d5a7c 07/19/2007 02:48 PM Diego Biurrun

cosmetics: indentation

Originally committed as revision 9758 to svn://svn.ffmpeg.org/ffmpeg/trunk

d0f596b4 07/19/2007 02:48 PM Diego Biurrun

Make video hook infrastructure conditional on video hooks being enabled.

Originally committed as revision 9757 to svn://svn.ffmpeg.org/ffmpeg/trunk

d24ce947 07/19/2007 12:44 AM Alex Beregszaszi

indentation fix

Originally committed as revision 9746 to svn://svn.ffmpeg.org/ffmpeg/trunk

6c4d4fa3 07/19/2007 12:43 AM Alex Beregszaszi

removed unused variable ti

Originally committed as revision 9745 to svn://svn.ffmpeg.org/ffmpeg/trunk

43924f01 07/17/2007 01:04 PM Alex Beregszaszi

use av_q2d as in the rest of the file

Originally committed as revision 9720 to svn://svn.ffmpeg.org/ffmpeg/trunk

7495c306 07/13/2007 04:11 PM Ramiro Polla

Check for GetProcessTimes and use it in getutime

Originally committed as revision 9629 to svn://svn.ffmpeg.org/ffmpeg/trunk

7829950c 07/13/2007 04:05 PM Ramiro Polla

Collapse getutime into one declaration

Originally committed as revision 9628 to svn://svn.ffmpeg.org/ffmpeg/trunk

66be5b45 07/13/2007 04:04 PM Ramiro Polla

Check for getrusage

Originally committed as revision 9627 to svn://svn.ffmpeg.org/ffmpeg/trunk

4b54c6d0 07/11/2007 02:07 PM Ramiro Polla

Check for termios before conio

Originally committed as revision 9598 to svn://svn.ffmpeg.org/ffmpeg/trunk

e16e49ac 07/11/2007 02:04 PM Ramiro Polla

Proper check for interactive support (termios and conio).

Originally committed as revision 9597 to svn://svn.ffmpeg.org/ffmpeg/trunk

7c37e504 07/10/2007 09:52 PM Ramiro Polla

Remove OS/2 support

Originally committed as revision 9586 to svn://svn.ffmpeg.org/ffmpeg/trunk

4021300c 07/08/2007 09:20 AM Diego Biurrun

grammar error noticed by Mark Cox

Originally committed as revision 9534 to svn://svn.ffmpeg.org/ffmpeg/trunk

c0de00da 07/06/2007 11:47 AM Stefano Sabatini

me option implemented as an AVOption
patch by Stefano Sabatini: [stefano sabatini-lala poste it]
original thread:
[FFmpeg-devel] [PATCH] ffmpeg.c -me option implemented as an AVOption
date: 07/05/2007 03:12 PM

Originally committed as revision 9501 to svn://svn.ffmpeg.org/ffmpeg/trunk

e5a389a1 07/05/2007 10:40 AM Diego Biurrun

license header consistency cosmetics

Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f4e8165 07/02/2007 07:43 AM Ronald S. Bultje

to be able to compile without HAVE_AV_CONFIG_H
patch by Ronald S. Bultje: [rsbultje gmail com]
original thread: [FFmpeg-devel] ffmpeg.c/cmdutils.c compilation
date: 06/23/2007 03:15 AM

Originally committed as revision 9453 to svn://svn.ffmpeg.org/ffmpeg/trunk

9de8e6ac 06/26/2007 04:13 PM Ronald S. Bultje

remove ENABLE_SWSCALER conditions
patch by Ronald S. Bultje: [rsbultje gmail com]

Originally committed as revision 9435 to svn://svn.ffmpeg.org/ffmpeg/trunk

29cc1c23 06/26/2007 03:52 PM Benoit Fouet

Make globals static

Originally committed as revision 9433 to svn://svn.ffmpeg.org/ffmpeg/trunk

f7d78f36 06/24/2007 11:27 AM Måns Rullgård

replace the uses of old string functions that Reimar missed

Originally committed as revision 9406 to svn://svn.ffmpeg.org/ffmpeg/trunk

b33ece16 06/18/2007 08:08 AM Stefano Sabatini

replace calls to deprecated parsing functions to calls to new ones
patch by Stefano Sabatini: [stefano sabatini-lala poste it]

Originally committed as revision 9359 to svn://svn.ffmpeg.org/ffmpeg/trunk

755bfeab 06/12/2007 09:29 AM Diego Biurrun

misc spelling fixes

Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk

364a9607 06/10/2007 02:34 PM Diego Biurrun

Move HAVE_AV_CONFIG_H definition to the Makefile like in the rest of FFmpeg.

Originally committed as revision 9273 to svn://svn.ffmpeg.org/ffmpeg/trunk

c3b95b1d 05/30/2007 02:20 PM Stefano Sabatini

Add support for listing the supported pixel formats using the option
-pix_fmt list
patch by Stefano Sabatini stefano sabatini minus lala chez poste it
original thread: [FFmpeg-devel] [PATCH] List supported pixel formats
date: 05/25/2007 05:46 PM

Originally committed as revision 9162 to svn://svn.ffmpeg.org/ffmpeg/trunk

808d83fd 05/30/2007 10:11 AM Aurelien Jacobs

cosmetics: indentation

Originally committed as revision 9161 to svn://svn.ffmpeg.org/ffmpeg/trunk

8623e558 05/30/2007 10:09 AM Aurelien Jacobs

use if(ENABLE_SWSCALER) instead of #ifdef CONFIG_SWSCALER

Originally committed as revision 9160 to svn://svn.ffmpeg.org/ffmpeg/trunk

35926489 05/23/2007 06:35 PM Ivo van Poorten

-sws_flags command line option to set swscaler flags

Originally committed as revision 9109 to svn://svn.ffmpeg.org/ffmpeg/trunk

df0cecdd 05/21/2007 09:50 AM Luca Abeni

Do not try to set a video standard unless "-tvstd" is specified

Originally committed as revision 9088 to svn://svn.ffmpeg.org/ffmpeg/trunk

3688f93a 05/09/2007 08:17 AM Nicolas George

make help message go to standard output instead of standard error
patch by Nicolas George \ nicolas george normalesup org /

Originally committed as revision 8947 to svn://svn.ffmpeg.org/ffmpeg/trunk

b60d1379 04/25/2007 01:55 PM Stefano Sabatini

add a vstats_file command line option
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 8810 to svn://svn.ffmpeg.org/ffmpeg/trunk

4bd0c2b1 04/25/2007 01:48 PM Benoit Fouet

Revert my two previous deliveries (back to r8806) to aply the good patch for vstats

Originally committed as revision 8809 to svn://svn.ffmpeg.org/ffmpeg/trunk

f5eb2b65 04/25/2007 12:19 PM Benoit Fouet

to complete r8807: free vstats resources

Originally committed as revision 8808 to svn://svn.ffmpeg.org/ffmpeg/trunk

f801d8aa 04/25/2007 09:32 AM Stefano Sabatini

add a vstats_file command line option
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 8807 to svn://svn.ffmpeg.org/ffmpeg/trunk

859d95ba 04/14/2007 05:50 PM Michael Niedermayer

fix overhead and bitrate statistics

Originally committed as revision 8732 to svn://svn.ffmpeg.org/ffmpeg/trunk

eddc482d 03/31/2007 04:04 PM Baptiste Coudurier

print error message

Originally committed as revision 8569 to svn://svn.ffmpeg.org/ffmpeg/trunk

f9645d7c 03/30/2007 11:31 AM Baptiste Coudurier

change -fs to use bytes instead of kbytes

Originally committed as revision 8556 to svn://svn.ffmpeg.org/ffmpeg/trunk

85ad1b0e 03/30/2007 09:44 AM Baptiste Coudurier

change -fs option to use OPT_INT64

Originally committed as revision 8555 to svn://svn.ffmpeg.org/ffmpeg/trunk

d1b23569 03/29/2007 11:39 AM Baptiste Coudurier

1000l, revert r8547, im too stupid

Originally committed as revision 8548 to svn://svn.ffmpeg.org/ffmpeg/trunk

ed057fcc 03/29/2007 11:13 AM Baptiste Coudurier

typo, fix -fs

Originally committed as revision 8547 to svn://svn.ffmpeg.org/ffmpeg/trunk

4992d8bf 03/29/2007 05:24 AM Bobby Bingham

Change the vhook code to send real timestamps to the filters instead of the
current time of day, which is useless, and which the filters could just as
easily query for themselves.
patch by Bobby Bingham, uhmmmm gmail com

Originally committed as revision 8541 to svn://svn.ffmpeg.org/ffmpeg/trunk

5508d26b 03/28/2007 11:53 AM Baptiste Coudurier

fix decoding of big audio packets (48k 16bit 2 channels), needed size is related to samples which is short * while len passed to decode_audio2 is related to pkt->data which is uint8_t *

Originally committed as revision 8537 to svn://svn.ffmpeg.org/ffmpeg/trunk

c367d067 03/27/2007 09:47 PM Michael Niedermayer

prevent exit missuse

Originally committed as revision 8536 to svn://svn.ffmpeg.org/ffmpeg/trunk

7fc98937 03/16/2007 04:13 PM Limin Wang

add fps stats, patch by Limin Wang <lance lmwang at gmail com>

Originally committed as revision 8422 to svn://svn.ffmpeg.org/ffmpeg/trunk

2a89ee9a 03/12/2007 05:13 PM Ramiro Polla

Remove superfluous HAVE_THREADS #ifdef.
patch by Ramiro Polla, angustia arrozcru.no-ip org

Originally committed as revision 8348 to svn://svn.ffmpeg.org/ffmpeg/trunk

1420b837 03/12/2007 02:42 PM Diego Biurrun

Remove superfluous header include.

Originally committed as revision 8341 to svn://svn.ffmpeg.org/ffmpeg/trunk

bde0705c 03/12/2007 02:35 PM Limin Wang

cosmetics: Fix indentation, patch by Limin Wang, lance.lmwang gmail com.

Originally committed as revision 8340 to svn://svn.ffmpeg.org/ffmpeg/trunk

750f0e1f 03/12/2007 02:17 PM Panagiotis Issaris

Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk

17ceb4f9 03/12/2007 10:24 AM Baptiste Coudurier

add message saying that pgmyuv format is deprecated

Originally committed as revision 8336 to svn://svn.ffmpeg.org/ffmpeg/trunk

348d46f2 03/09/2007 11:22 AM Limin Wang

remove unused code, patch by Limin Wang <lance lmwang at gmail com>

Originally committed as revision 8304 to svn://svn.ffmpeg.org/ffmpeg/trunk

4e780252 03/07/2007 10:45 AM Limin Wang

Remove unnecessary the_end label.
patch by Limin Wang, lance.lmwang gmail com

Originally committed as revision 8287 to svn://svn.ffmpeg.org/ffmpeg/trunk

54cc9c46 03/07/2007 09:50 AM Michael Niedermayer

set defaults based on CodecType by using avcodec_get_context_defaults2()

Originally committed as revision 8285 to svn://svn.ffmpeg.org/ffmpeg/trunk

8e532e68 03/07/2007 09:38 AM Limin Wang

remove unused variables
patch by Limin Wang % lance P lmwang A gmail P com %
Original thread:
Subj: [Ffmpeg-devel] [PATCH] remove unused variables
Date: 2007-03-07-07:37 AM

Originally committed as revision 8284 to svn://svn.ffmpeg.org/ffmpeg/trunk

2d0aefd6 03/07/2007 08:34 AM Michael Niedermayer

only store command line parameters in contexts with matching codec_type

Originally committed as revision 8282 to svn://svn.ffmpeg.org/ffmpeg/trunk

cbc09a7d 03/07/2007 12:27 AM Alex Beregszaszi

typo: unkown->unknown

Originally committed as revision 8274 to svn://svn.ffmpeg.org/ffmpeg/trunk

cb50328d 03/05/2007 09:08 PM Michael Niedermayer

free opt_names at the end of main() based on a patch by Limin Wang

Originally committed as revision 8268 to svn://svn.ffmpeg.org/ffmpeg/trunk

4dcc383a 03/05/2007 09:02 PM Michael Niedermayer

indention

Originally committed as revision 8267 to svn://svn.ffmpeg.org/ffmpeg/trunk

4913b231 03/05/2007 09:01 PM Michael Niedermayer

remove usless if() before av_free()

Originally committed as revision 8266 to svn://svn.ffmpeg.org/ffmpeg/trunk

066a81a8 03/05/2007 10:04 AM Benoit Fouet

change management of "ab" option in ffmpeg.c, so that it works as "b" option.
patch by Benoit Fouet % benoit P fouet A purplelabs P com %
Original thread:
Subj: [Ffmpeg-devel] [PATCH] use new way to handle "ab" option
Date: 03/03/2007 10:51 PM

Originally committed as revision 8244 to svn://svn.ffmpeg.org/ffmpeg/trunk

636d6a4a 03/04/2007 11:53 AM Panagiotis Issaris

Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img"
to "picture" as suggested by Baptiste Coudurier.

Originally committed as revision 8220 to svn://svn.ffmpeg.org/ffmpeg/trunk

ea0fe83b 03/01/2007 04:36 PM Baptiste Coudurier

remove ps option and rename rtp_payload_size AVOption to ps

Originally committed as revision 8172 to svn://svn.ffmpeg.org/ffmpeg/trunk

23b254fb 03/01/2007 02:33 PM Benoit Fouet

duplicate *_opts for every codec types, in order to have the "ab" and "b" options work in the same manner
patch by Benoit Fouet benoit P fouet A purplelabs P com
Orginal thread:
Date: Feb 22, 2007 11:15 AM
Subject: [Ffmpeg-devel] [PATCH] ffmpeg.c duplicate *_opts for every codec types...

7a168618 02/28/2007 03:07 PM Luca Abeni

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

f66e4f5f 02/25/2007 10:27 AM Reimar Döffinger

Add av_ prefix to clip functions

Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk

036bfd18 02/20/2007 10:07 AM Benoit Fouet

Move the aframes option from the video "subsection" to the
audio "subsection".
Patch by Benoit Fouet, benoit fouet % purplelabs com.

Originally committed as revision 8037 to svn://svn.ffmpeg.org/ffmpeg/trunk

cc58300e 02/14/2007 05:01 PM Ramiro Polla

implement new grabbing interface, as described here:
ttp://thread.gmane.org/gmane.comp.video.ffmpeg.devel/42920
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
Date: Jan 31, 2007 8:56 PM
Subject: [Ffmpeg-devel] [PATCH] New grabbing interface...

35f97369 02/13/2007 11:45 PM Måns Rullgård

rename POWERPC_PERFORMANCE_REPORT to CONFIG_POWERPC_PERF

Originally committed as revision 7968 to svn://svn.ffmpeg.org/ffmpeg/trunk

8fa36ae0 02/13/2007 06:26 PM François Revol

This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed....

8d74e55b 02/09/2007 05:45 PM Matthijs Douze

Print error message instead of crashing when combining -vcodec copy and -vhook.
patch by Matthijs Douze, Matthijs.Douze inrialpes fr

Originally committed as revision 7901 to svn://svn.ffmpeg.org/ffmpeg/trunk

928e0094 02/09/2007 11:15 AM Diego Biurrun

happy new year

Originally committed as revision 7895 to svn://svn.ffmpeg.org/ffmpeg/trunk

ab1c6dc9 02/08/2007 06:55 PM Luca Abeni

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

57b7e784 02/05/2007 04:07 PM Michel Bardiaux

Force stereo in target vcd.
Patch by Michel Bardiaux, mbardiaux mediaxim be.

Originally committed as revision 7826 to svn://svn.ffmpeg.org/ffmpeg/trunk

5d55e966 02/01/2007 12:34 AM Michael Niedermayer

use avcodec_decode_audio2()

Originally committed as revision 7792 to svn://svn.ffmpeg.org/ffmpeg/trunk

e3e3be53 01/25/2007 09:46 AM Baptiste Coudurier

do not force output audio channels

Originally committed as revision 7705 to svn://svn.ffmpeg.org/ffmpeg/trunk

bd31a388 01/23/2007 01:04 PM Baptiste Coudurier

AVOption is now const, removes a few warnings

Originally committed as revision 7662 to svn://svn.ffmpeg.org/ffmpeg/trunk

079e8cb9 01/22/2007 10:01 AM Baptiste Coudurier

do not override rc_buffer_occupancy if set

Originally committed as revision 7641 to svn://svn.ffmpeg.org/ffmpeg/trunk

27571d3d 01/13/2007 04:51 PM Ramiro Polla

Segmentation fault fix when no video device is specified.
patch by Ramiro Polla % ramiro A lisha P ufsc P br %

Originally committed as revision 7445 to svn://svn.ffmpeg.org/ffmpeg/trunk

f58f4ce1 12/13/2006 08:45 AM Guillaume Poirier

Original X11 device demuxer patch from Clemens Fruhwirth

- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
structure for libavformat registration is renamed to...

83c547a4 12/13/2006 12:06 AM Guillaume Poirier

revert broken commit of x11 device demuxer patch

Originally committed as revision 7301 to svn://svn.ffmpeg.org/ffmpeg/trunk

e519b02c 12/12/2006 10:31 PM Guillaume Poirier

Original X11 device demuxer patch from Clemens Fruhwirth

- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
structure for libavformat registration is renamed to...

386c88de 12/09/2006 01:12 PM Baptiste Coudurier

print a more correct message when container frame rate differs from codec frame rate

Originally committed as revision 7264 to svn://svn.ffmpeg.org/ffmpeg/trunk

f27a7268 12/07/2006 12:47 AM Måns Rullgård

use standard INT64_MAX instead of MAXINT64 (and MIN)

Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk

3c132023 12/05/2006 02:01 PM Baptiste Coudurier

fix memleak, free stream codec allocated by av_new_stream

Originally committed as revision 7225 to svn://svn.ffmpeg.org/ffmpeg/trunk

d86b83f8 11/22/2006 12:15 PM Ramiro Polla

add interactive support for MinGW
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Orignial thread:
date: Nov 5, 2006 1:55 AM
subject: [Ffmpeg-devel] [PATCH] MinGW interactive support

Originally committed as revision 7155 to svn://svn.ffmpeg.org/ffmpeg/trunk

f889d3f9 11/10/2006 09:44 AM Michael Niedermayer

also set strict_std_compliance for stream copy, its needed for the bitstream filters

Originally committed as revision 6959 to svn://svn.ffmpeg.org/ffmpeg/trunk

4408e75e 11/06/2006 09:54 PM Michael Niedermayer

2nd try for -vcodec copy timebase selection last one choose 1fps due to broken opendivx stream in avi (avi had the correct 15fps)

Originally committed as revision 6920 to svn://svn.ffmpeg.org/ffmpeg/trunk