diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:00:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:02:01 +0100 |
| commit | 0a5da9cc148b2ac7102b4a0653c38735672629f6 (patch) | |
| tree | f20d33699f6f79a2daaaaa2513bb7fcc0f396a7e /libavcodec/ppc | |
| parent | 950482bf587889c507340ae5893a851be8e99fcc (diff) | |
| parent | c6f1dc8e4cd967ae056698eafb891a08003c211c (diff) | |
| download | ffmpeg-0a5da9cc148b2ac7102b4a0653c38735672629f6.tar.gz | |
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
rtpdec: Move setting the parsing flags to the actual depacketizers
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Conflicts:
libavformat/rtpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
0 files changed, 0 insertions, 0 deletions