| 
							
							
								 Michael Niedermayer | 5c2ccf83df | Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43' * commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  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 | 950482bf58 | Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c' * commit '2326558d5277ec87ba6d607a01ec6acfc51c694c':
  rtpdec: Split mpegts parsing to a normal depacketizer
  rtpdec: Reorder payload handler registration alphabetically
Merged-by: Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:52:42 +01:00 |  | 
			
				
					| 
							
							
								 Martin Storsjö | 2326558d52 | rtpdec: Split mpegts parsing to a normal depacketizer This gets rid of a number of special cases from the common rtpdec
code.
Signed-off-by: Martin Storsjö <martin@martin.st> | 2013-01-20 18:17:17 +02:00 |  |