aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpenc_amr.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'Michael Niedermayer2015-03-011-1/+4
|\
| * rtpenc: Don't set max_frames_per_packet based on the packet frame size or fra...Martin Storsjö2015-02-281-1/+4
* | Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'Michael Niedermayer2015-03-011-1/+3
|\|
| * rtpenc: Restructure if statements in packetizers to simplify adding more cond...Martin Storsjö2015-02-281-1/+3
* | Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'Michael Niedermayer2015-03-011-1/+1
|\|
| * rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->bufMartin Storsjö2015-02-281-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\|
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/
* Rename the RTP muxer sources so that the packetisation functions are inLuca Abeni2010-01-181-0/+66