-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
shorten: Use separate pointers for the allocated memory for decoded samples.
atrac3: Fix crash in tonal component decoding.
ws_snd1: Fix wrong samples counts.
movenc: Don't set a default sample duration when creating ismv
rtp: Factorize the check for distinguishing RTCP packets from RTP
golomb: avoid infinite loop on all-zero input (or end of buffer).
bethsoftvid: synchronize video timestamps with audio sample rate
bethsoftvid: add audio stream only after getting the first audio packet
bethsoftvid: Set video packet duration instead of accumulating pts.
bethsoftvid: set packet key frame flag for audio and I-frame video packets.
bethsoftvid: fix read_packet() return codes.
bethsoftvid: pass palette in side data instead of in a separate packet.
sdp: Ignore RTCP packets when autodetecting RTP streams
proresenc: initialise 'sign' variable
mpegaudio: replace memcpy by SIMD code
vc1: prevent using last_frame as a reference for I/P first frame.
Conflicts:
libavcodec/atrac3.c
libavcodec/golomb.h
libavcodec/shorten.c
libavcodec/ws-snd1.c
tests/ref/fate/bethsoft-vid
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- ffmpeg.c 1 addition, 1 deletionffmpeg.c
- libavcodec/atrac3.c 1 addition, 1 deletionlibavcodec/atrac3.c
- libavcodec/bethsoftvideo.c 11 additions, 3 deletionslibavcodec/bethsoftvideo.c
- libavcodec/proresenc_kostya.c 2 additions, 0 deletionslibavcodec/proresenc_kostya.c
- libavcodec/shorten.c 2 additions, 1 deletionlibavcodec/shorten.c
- libavcodec/vc1dec.c 9 additions, 2 deletionslibavcodec/vc1dec.c
- libavcodec/ws-snd1.c 2 additions, 2 deletionslibavcodec/ws-snd1.c
- libavcodec/x86/mpegaudiodec_mmx.c 20 additions, 1 deletionlibavcodec/x86/mpegaudiodec_mmx.c
- libavformat/bethsoftvid.c 111 additions, 51 deletionslibavformat/bethsoftvid.c
- libavformat/movenc.c 4 additions, 3 deletionslibavformat/movenc.c
- libavformat/movenchint.c 1 addition, 1 deletionlibavformat/movenchint.c
- libavformat/rtp.h 2 additions, 0 deletionslibavformat/rtp.h
- libavformat/rtpdec.c 1 addition, 1 deletionlibavformat/rtpdec.c
- libavformat/rtpproto.c 1 addition, 1 deletionlibavformat/rtpproto.c
- libavformat/rtsp.c 3 additions, 0 deletionslibavformat/rtsp.c
- libavformat/rtspenc.c 1 addition, 1 deletionlibavformat/rtspenc.c
- tests/ref/fate/bethsoft-vid 72 additions, 71 deletionstests/ref/fate/bethsoft-vid
Loading
Please register or sign in to comment