Michael Niedermayer
5c2ccf83df
Merge commit ' 7abd35a1ff'
...
* commit '7abd35a1ff ':
avformat: Add av_cold attributes to init functions missing them
Conflicts:
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:19:56 +02:00
Diego Biurrun
7abd35a1ff
avformat: Add av_cold attributes to init functions missing them
2013-05-05 18:33:04 +02:00
Michael Niedermayer
0a5da9cc14
Merge commit ' c6f1dc8e4c'
...
* commit 'c6f1dc8e4c ':
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>
2013-01-21 14:02:01 +01:00
Martin Storsjö
c6f1dc8e4c
rtpdec: Move setting the parsing flags to the actual depacketizers
...
This gets rid of almost all the codec specific details from the
generic rtpdec code.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-20 18:20:42 +02:00
Martin Storsjö
a9c847c1ba
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
...
This also adds checking of mallocs.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-20 18:20:22 +02:00