mirror of https://git.ffmpeg.org/ffmpeg.git
a646ac8ef5
* commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1': avpacket: free side data in av_free_packet(). v4l2: do not assert on a value received from outside of Libav v4l2: set the average framerate instead of codec timebase. Conflicts: libavcodec/avpacket.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| alldevices.c | ||
| alsa-audio-common.c | ||
| alsa-audio-dec.c | ||
| alsa-audio-enc.c | ||
| alsa-audio.h | ||
| avdevice.c | ||
| avdevice.h | ||
| bktr.c | ||
| caca.c | ||
| dshow.c | ||
| dshow_capture.h | ||
| dshow_common.c | ||
| dshow_enummediatypes.c | ||
| dshow_enumpins.c | ||
| dshow_filter.c | ||
| dshow_pin.c | ||
| dv1394.c | ||
| dv1394.h | ||
| fbdev.c | ||
| iec61883.c | ||
| jack_audio.c | ||
| lavfi.c | ||
| libavdevice.v | ||
| libcdio.c | ||
| libdc1394.c | ||
| openal-dec.c | ||
| oss_audio.c | ||
| pulse.c | ||
| sdl.c | ||
| sndio_common.c | ||
| sndio_common.h | ||
| sndio_dec.c | ||
| sndio_enc.c | ||
| timefilter.c | ||
| timefilter.h | ||
| v4l.c | ||
| v4l2.c | ||
| version.h | ||
| vfwcap.c | ||
| x11grab.c | ||